COMMON: Fix 'Print #' on Windows to use Windows line endings

smallbasic · Jul 16, 2020 · 00bc338 · 00bc338
1 parent 2aa7814
commit 00bc338
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 10 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2020-07-16 (12.19)
+	COMMON: Fix 'Print #' on Windows to use Windows line endings
+
 2020-07-12 (12.19)
 	ANDROID: fix layout issue with samsung mobiles
 	ANDROID: save and restore the selected theme

diff --git a/src/common/blib.c b/src/common/blib.c
@@ -530,7 +530,7 @@ void cmd_print(int output) {
     if (code_peek() == kwTYPE_EOC || code_peek() == kwTYPE_LINE) {
       // There are no parameters
       if (dev_fstatus(handle)) {
-        dev_fwrite(handle, (byte *) "\n", 1);
+        dev_fwrite(handle, (byte *)OS_LINESEPARATOR, sizeof(OS_LINESEPARATOR));
       } else {
         err_fopen();
       }
@@ -642,7 +642,7 @@ void cmd_print(int output) {
   };
 
   if (last_op == 0) {
-    pv_write("\n", output, handle);
+    pv_write(output == PV_FILE ? OS_LINESEPARATOR : "\n", output, handle);
   }
 }
 

diff --git a/src/common/blib_db.c b/src/common/blib_db.c
@@ -725,7 +725,7 @@ void cmd_fsaveln() {
     for (int i = 0; i < v_asize(array_p); i++) {
       var_p = v_elem(array_p, i);
       fprint_var(handle, var_p);
-      dev_fwrite(handle, (byte *)"\n", 1);
+      dev_fwrite(handle, (byte *)OS_LINESEPARATOR, sizeof(OS_LINESEPARATOR));
     }
   } else {
     // parameter is an string

diff --git a/src/common/sys.h b/src/common/sys.h
@@ -54,8 +54,10 @@ extern "C" {
 
 #if defined(_Win32)
  #define SB_VERSYS "Win"
+ #define OS_LINESEPARATOR  "\r\n"
 #else
  #define SB_VERSYS "Unix"
+ #define OS_LINESEPARATOR  "\r\n"
 #endif
 
 #if UINTPTR_MAX == 0xffffffff

diff --git a/src/lib/miniaudio b/src/lib/miniaudio
diff --git a/src/lib/stb b/src/lib/stb
diff --git a/src/platform/android/app/build.gradle b/src/platform/android/app/build.gradle
@@ -8,9 +8,9 @@ android {
   defaultConfig {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 16
-    targetSdkVersion 29
-    versionCode 39
-    versionName "0.12.17"
+    targetSdkVersion 28
+    versionCode 40
+    versionName "12.19"
     resConfigs "en"
   }
 

diff --git a/src/platform/android/build.gradle b/src/platform/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.0.0'
+    classpath 'com.android.tools.build:gradle:4.0.1'
     classpath "com.github.ben-manes:gradle-versions-plugin:0.22.0"
   }
 }

diff --git a/src/platform/android/jni/Android.mk b/src/platform/android/jni/Android.mk
@@ -7,7 +7,7 @@
 
 JNI_PATH := $(call my-dir)
 SB_HOME := $(JNI_PATH)/../../../..
-FREETYPE_HOME := $(HOME)/android-sdk/freetype-2.7.1
+FREETYPE_HOME := $(HOME)/android-sdk/freetype-2.10.2
 
 include $(call all-subdir-makefiles)
 LOCAL_PATH := $(JNI_PATH)

diff --git a/src/platform/android/jni/freetype/Android.mk b/src/platform/android/jni/freetype/Android.mk
@@ -27,6 +27,7 @@ LOCAL_SRC_FILES:=                               \
   $(FREETYPE_HOME)/src/pcf/pcf.c                \
   $(FREETYPE_HOME)/src/psaux/psaux.c            \
   $(FREETYPE_HOME)/src/bdf/bdf.c                \
+  $(FREETYPE_HOME)/src/base/ftdebug.c           \
   $(FREETYPE_HOME)/src/base/ftbbox.c            \
   $(FREETYPE_HOME)/src/base/ftbitmap.c          \
   $(FREETYPE_HOME)/src/base/ftglyph.c           \
+9 −12		README.md
+8 −9		stb.h
+64 −12		stb_ds.h
+46 −23		stb_dxt.h
+160 −54		stb_image.h
+41 −17		stb_image_write.h
+2 −2		stb_sprintf.h
+2 −2		stb_truetype.h
+14 −6		stb_vorbis.c
+3 −1		tests/Makefile
+54 −0		tests/fuzz_main.c
+25 −0		tests/ossfuzz.sh
+74 −0		tests/stb_c_lexer_fuzzer.cpp
+0 −2		tests/stb_png_read_fuzzer.options
+11 −2		tests/stbi_read_fuzzer.c
+0 −3		tools/README.footer.md
+5 −5		tools/make_readme.c