From: chaoskagami <chaos.kagami@gmail.com>
Date: Tue, 26 Aug 2014 04:46:20 +0000 (-0400)
Subject: Android build is NOT working currently. However, PC peoples now have fullscreen mode... 
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=1982fb78b84fe7edfe01a2bd291ee4200536c563;p=vn%2Fvndc.git

Android build is NOT working currently. However, PC peoples now have fullscreen mode. Yay.
---

diff --git a/external/Android/jni/SDL/src/main/android/SDL_android_main.c b/external/Android/jni/SDL/src/main/android/SDL_android_main.c
index f932f31..85aed13 100644
--- a/external/Android/jni/SDL/src/main/android/SDL_android_main.c
+++ b/external/Android/jni/SDL/src/main/android/SDL_android_main.c
@@ -26,9 +26,10 @@ void Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject
 
     /* Run the application code! */
     int status;
-    char *argv[2];
+    char *argv[3];
     argv[0] = SDL_strdup("SDL_app");
-    argv[1] = NULL;
+    argv[1] = SDL_strdup("-v");
+    argv[2] = NULL;
     status = SDL_main(1, argv);
 
     /* Do not issue an exit or the whole application will terminate instead of just the SDL thread */
diff --git a/external/zero/include/Zero.hpp b/external/zero/include/Zero.hpp
index 9ff789f..b272e53 100644
--- a/external/zero/include/Zero.hpp
+++ b/external/zero/include/Zero.hpp
@@ -7,6 +7,10 @@
 
 #include <gitrev.hpp>
 
+#ifdef USE_ANDROID
+#define printf SDL_Log
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/vndc/include/Data.hpp b/vndc/include/Data.hpp
index d5385c5..6758d34 100644
--- a/vndc/include/Data.hpp
+++ b/vndc/include/Data.hpp
@@ -36,6 +36,7 @@ class DataContainer {
 		int currentLine;
 		bool skip_key_on;
 		bool sw_rendering;
+		bool fullscreen;
 		bool eof;
 		char* window_name;
 		char* next_line; // Used for voice-detect.
diff --git a/vndc/include/gitrev.hpp b/vndc/include/gitrev.hpp
index 1dbb938..bb44b26 100644
--- a/vndc/include/gitrev.hpp
+++ b/vndc/include/gitrev.hpp
@@ -1,5 +1,5 @@
 #ifndef GIT_REV_HDR
 #define GIT_REV_HDR
-#define GIT_REV "456cf80a21b450122572c15584e45b8d502cab45"
+#define GIT_REV "76f2254e2693ed8e1696445264e7aed57e60784e"
 
 #endif
diff --git a/vndc/src/Data.cpp b/vndc/src/Data.cpp
index dc01e0e..329a30b 100644
--- a/vndc/src/Data.cpp
+++ b/vndc/src/Data.cpp
@@ -32,8 +32,10 @@ DataContainer::DataContainer() {
 	skip_key_on = false;
 	#ifdef USE_ANDROID
 	sw_rendering = true;
+	fullscreen = true;
 	#else
 	sw_rendering = false;
+	fullscreen = false;
 	#endif
 	eof = false;
 	next_line = NULL; // Used for voice-detect.
diff --git a/vndc/src/Loop.cpp b/vndc/src/Loop.cpp
index 88a8536..13e5be6 100644
--- a/vndc/src/Loop.cpp
+++ b/vndc/src/Loop.cpp
@@ -39,7 +39,7 @@ void Loop() {
 
 void Setup() {
 	// Init window
-	GetData()->ctx->InitWindowLogical(GetData()->physical_w, GetData()->physical_h, GetData()->screen_w, GetData()->screen_h, false, !(GetData()->sw_rendering));
+	GetData()->ctx->InitWindowLogical(GetData()->physical_w, GetData()->physical_h, GetData()->screen_w, GetData()->screen_h, GetData()->fullscreen, !(GetData()->sw_rendering));
 
 	GetData()->window_name = (char*)calloc(sizeof(char), 400);
 	sprintf(GetData()->window_name, "%s", "VNDC Interpreter ");
diff --git a/vndc/src/VNDC.cpp b/vndc/src/VNDC.cpp
index 19f4f81..57d23a1 100644
--- a/vndc/src/VNDC.cpp
+++ b/vndc/src/VNDC.cpp
@@ -28,12 +28,18 @@ int main(int argc, char** argv) {
 	char c;
 	#ifdef USE_ANDROID
 	bool software = true;
+	bool fulls = true;
 	#else
 	bool software = false;	
+	bool fulls = false;
 	#endif
 
-	while((c = getopt(argc, argv, "wnbvx:y:d:m:s:ch")) != -1) {
+	while((c = getopt(argc, argv, "fwnbvx:y:d:m:s:ch")) != -1) {
 		switch(c) {
+			case 'f':
+				printf("[info] Starting in fullscreen mode.\n");
+				fulls = true;
+				break;
 			case 'w':
 				#ifdef USE_ANDROID
 				printf("[info] Forcing Hardware Acceleration.\n");
@@ -80,6 +86,7 @@ int main(int argc, char** argv) {
 			case 'h':
 				printf("-x size -y size\tStretch display window to WxH\n");
 				printf("-w\t\tUse Software Rendering (on android: force HW render)\n");
+				printf("-f\t\tFullscreen mode.\n");
 				printf("-n\t\tNew Game. Do not reload default save.\n");
 				printf("-d dir\t\tChange to directory/Run game in directory\n");
 				printf("-b\t\tDebug Mode. Hit Ctrl+C on console for shell\n");
@@ -110,9 +117,12 @@ int main(int argc, char** argv) {
 		memset(GetData()->main_scr[0], 0, 399);
 		strncpy(GetData()->main_scr[0], main_script_override, 399);
 	}
+
 	GetData()->vndc_enabled = vndc_extensions;
 	GetData()->verbose = enable_v;
 	GetData()->sw_rendering = software;
+	GetData()->fullscreen = fulls;
+
 	if(debug_enable) {
 		signal(SIGINT, DebugTrap);
 		GetData()->debug_mode = true;