preparing to release 0.70.1

nesbox · Aug 11, 2018 · cf98c17 · cf98c17
1 parent 6e4b33e
commit cf98c17
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 22 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="6003"
-      android:versionName="0.60.3"
+      android:versionCode="7001"
+      android:versionName="0.70.1"
       android:installLocation="auto">
 
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />

diff --git a/build/html/tic.js b/build/html/tic.js
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/system.c b/src/system.c
@@ -834,6 +834,8 @@ static void blitSound()
 	else SDL_QueueAudio(platform.audio.device, tic->samples.buffer, tic->samples.size);
 }
 
+#if !defined(__EMSCRIPTEN__) && !defined(__MACOSX__)
+
 static void renderKeyboard()
 {
 	if(platform.touchCounter == 0 || !isKbdVisible()) return;
@@ -907,6 +909,8 @@ static void renderGamepad()
 	}
 }
 
+#endif
+
 static void blitCursor(const u8* in)
 {
 	if(!platform.mouse.texture)

diff --git a/src/tic.h b/src/tic.h
@@ -28,8 +28,8 @@
 
 #define TIC_VERSION_MAJOR 0
 #define TIC_VERSION_MINOR 70
-#define TIC_VERSION_PATCH 0
-#define TIC_VERSION_STATUS "-dev.5"
+#define TIC_VERSION_PATCH 1
+#define TIC_VERSION_STATUS ""
 
 #if defined(TIC80_PRO)
 #define TIC_VERSION_POST " Pro"