Merge branch 'sdl_android' of github.com:pelya/commandergenius into python3_testing

project/java/Keycodes.java

@@ -566,6 +566,10 @@ class SDL_Keys
 		try {
 			for(Field f: fields)
 			{
+				if( !f.getName().startsWith("SDLK_") )
+				{
+					continue;
+				}
 				Values.add(f.getInt(null));
 				Names.add(f.getName().substring(5).toUpperCase());
 			}

project/java/Settings.java

@@ -78,7 +78,7 @@ import android.content.Intent;
 
 
 // TODO: too much code here, split into multiple files, possibly auto-generated menus?
-class Settings
+public class Settings
 {
 	static String SettingsFileName = "libsdl-settings.cfg";
 

project/java/translations/values-zh/strings.xml

@@ -196,8 +196,6 @@
     <string name="gamehelper_unknown_error">未知错误。</string>
     <string name="accessing_network">正在访问网络，请稍候</string>
 
-    <string name="google_play_game_services_app_id" translatable="false">==GOOGLEPLAYGAMESERVICES_APP_ID==</string>
-
     <string name="restarting_please_wait">重新启动中，请稍候。</string>
 
     <string name="notification_app_is_running">%s 正在运行中</string>

project/jni/openssl/include/openssl/opensslconf.h

@@ -118,8 +118,8 @@ extern "C" {
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/home/gerstrong/workspace/SDLAndroid/project/jni/openssl/build/armeabi-v7a/dist/lib/engines"
-#define OPENSSLDIR "/home/gerstrong/workspace/SDLAndroid/project/jni/openssl/build/armeabi-v7a/dist/ssl"
+#define ENGINESDIR "/home/pelya/src/endless_space/bochs/sdl/project/jni/openssl/build/armeabi-v7a/dist/lib/engines"
+#define OPENSSLDIR "/home/pelya/src/endless_space/bochs/sdl/project/jni/openssl/build/armeabi-v7a/dist/ssl"
 #endif
 #endif