Merge branch 'master' into stable

nesbox · Jan 13, 2018 · 126023c · 126023c
2 parents 2f94c89 + b567be4
commit 126023c
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 13 deletions.
diff --git a/bin/assets/tic.js.dat b/bin/assets/tic.js.dat
diff --git a/build/android/AndroidManifest.xml b/build/android/AndroidManifest.xml
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.nesbox.tic"
-      android:versionCode="6001"
-      android:versionName="0.60.1"
+      android:versionCode="6003"
+      android:versionName="0.60.3"
       android:installLocation="auto">
 
     <!-- Android 2.3.3 -->
@@ -34,7 +34,7 @@
                  android:hardwareAccelerated="true" >
         <activity android:name="TIC"
                   android:label="@string/app_name"
-                  android:configChanges="keyboardHidden|keyboard|orientation|screenSize"
+                  android:configChanges="keyboardHidden|keyboard|orientation"
                   >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/build/android/default.properties b/build/android/default.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-16
+target=android-12
diff --git a/build/android/jni/src/Android.mk b/build/android/jni/src/Android.mk
@@ -8,7 +8,7 @@ SRC_PATH := ../../../../src
 THIRD_PARTY_PATH := ../../../../../3rd-party
 
 LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/SDL2-2.0.7/include \
+	$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/SDL2-2.0.5/include \
 	$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/lua-5.3.1/src \
 	$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/giflib-5.1.4/lib \
 	$(LOCAL_PATH)/$(THIRD_PARTY_PATH)/zlib-1.2.8 \
@@ -20,6 +20,7 @@ LOCAL_C_INCLUDES := \
 
 # Add your application source files here...
 LOCAL_SRC_FILES := \
+	$(THIRD_PARTY_PATH)/SDL2-2.0.5/src/main/android/SDL_android_main.c \
 	$(THIRD_PARTY_PATH)/duktape-2.2.0/src/duktape.c \
 	$(THIRD_PARTY_PATH)/blip-buf/blip_buf.c \
 	$(THIRD_PARTY_PATH)/SDL2_net-2.0.1/SDLnet.c \

diff --git a/build/android/project.properties b/build/android/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-12
diff --git a/build/macosx/Info.plist b/build/macosx/Info.plist
@@ -19,9 +19,9 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.60.1</string>
+  <string>0.60.3</string>
   <key>CFBundleVersion</key>
-  <string>0.60.1</string>
+  <string>0.60.3</string>
   <key>NSHumanReadableCopyright</key>
   <string>http://tic.computer © 2017</string>
   <key>NSHighResolutionCapable</key>

diff --git a/build/uwp/tic/Package.appxmanifest b/build/uwp/tic/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="50446Nesbox.TICcomputer" Publisher="CN=1040DC4A-04A1-4B33-9107-C1A9D74775D4" Version="0.60.1.0" />
+  <Identity Name="50446Nesbox.TICcomputer" Publisher="CN=1040DC4A-04A1-4B33-9107-C1A9D74775D4" Version="0.60.3.0" />
   <mp:PhoneIdentity PhoneProductId="93515db0-8ee3-478b-933a-5776b58247b2" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>TIC-80</DisplayName>

diff --git a/build/windows/tic/tic.aps b/build/windows/tic/tic.aps
diff --git a/build/windows/tic/tic.rc b/build/windows/tic/tic.rc
diff --git a/src/tic.c b/src/tic.c
@@ -1998,7 +1998,7 @@ void parseCode(const tic_script_config* config, const char* start, u8* color, co
 
 	while(true)
 	{
-		char c = *ptr;
+		char c = ptr[0];
 
 		if(blockCommentStart)
 		{
@@ -2135,7 +2135,7 @@ void parseCode(const tic_script_config* config, const char* start, u8* color, co
 				ptr += strlen(config->singleComment);
 				continue;
 			}
-			else if(isalpha_(c) && ptr[-1] != '.')
+			else if(isalpha_(c))
 			{
 				wordStart = ptr;
 				ptr++;

diff --git a/src/tic.h b/src/tic.h
@@ -28,7 +28,7 @@
 
 #define TIC_VERSION_MAJOR 0
 #define TIC_VERSION_MINOR 60
-#define TIC_VERSION_PATCH 1
+#define TIC_VERSION_PATCH 3
 #define TIC_VERSION_STATUS ""
 
 #if defined(TIC80_PRO)