Permalink
Browse files

Minor fixes to build system

  • Loading branch information...
pelya committed Jul 5, 2011
1 parent b4546c9 commit 999950bd02fdfac5635d2c699f9aa456b5ddc1a6
View
@@ -13,4 +13,4 @@ done
cat exports.txt | sort > exports1.txt
mv -f exports1.txt exports.txt
diff libapplication.txt exports.txt | grep \< | cut -d \ -f 2
-rm libapplication.txt exports.txt
+rm libapplication.txt exports.txt
@@ -31,11 +31,8 @@ APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]
APP_AVAILABLE_STATIC_LIBS=`grep 'APP_AVAILABLE_STATIC_LIBS [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
APP_SHARED_LIBS=$(
echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
- STATIC=`echo $APP_AVAILABLE_STATIC_LIBS | grep "\\\\b$LIB\\\\b"`
- if [ "$LIB" = "application" ] ; then true
- elif [ "$LIB" = "sdl_main" ] ; then true
- elif [ "$LIB" = "stlport" ] ; then true
- elif [ -n "$STATIC" ] ; then true
+ STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
+ if [ -n "$STATIC" ] ; then true
else
echo $LIB
fi
@@ -29,11 +29,8 @@ APP_MODULES=`grep 'APP_MODULES [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]
APP_AVAILABLE_STATIC_LIBS=`grep 'APP_AVAILABLE_STATIC_LIBS [:][=]' $LOCAL_PATH/../Settings.mk | sed 's@.*[=]\(.*\)@\1@'`
APP_SHARED_LIBS=$(
echo $APP_MODULES | xargs -n 1 echo | while read LIB ; do
- STATIC=`echo $APP_AVAILABLE_STATIC_LIBS | grep "\\\\b$LIB\\\\b"`
- if [ "$LIB" = "application" ] ; then true
- elif [ "$LIB" = "sdl_main" ] ; then true
- elif [ "$LIB" = "stlport" ] ; then true
- elif [ -n "$STATIC" ] ; then true
+ STATIC=`echo $APP_AVAILABLE_STATIC_LIBS application sdl_main stlport stdout-test | grep "\\\\b$LIB\\\\b"`
+ if [ -n "$STATIC" ] ; then true
else
echo $LIB
fi
@@ -27,6 +27,7 @@ common_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)
LOCAL_SRC_FILES := $(common_SRC_FILES)
LOCAL_CFLAGS += $(common_CFLAGS)
LOCAL_C_INCLUDES += $(common_C_INCLUDES)
+LOCAL_LDLIBS := -lz
LOCAL_MODULE:= png
@@ -76,6 +76,7 @@ static SDL_Surface *ANDROID_SetVideoModeMT(_THIS, SDL_Surface *current, int widt
static void ANDROID_VideoQuitMT(_THIS);
static void ANDROID_UpdateRectsMT(_THIS, int numrects, SDL_Rect *rects);
static int ANDROID_FlipHWSurfaceMT(_THIS, SDL_Surface *surface);
+static int ANDROID_ToggleFullScreen(_THIS, int fullscreen);
// Stubs to get rid of crashing in OpenGL mode
@@ -106,6 +107,10 @@ void ANDROID_WarpWMCursor(_THIS, Uint16 x, Uint16 y)
}
//void ANDROID_MoveWMCursor(_THIS, int x, int y) { }
+int ANDROID_ToggleFullScreen(_THIS, int fullscreen)
+{
+ return 1;
+}
#define SDL_NUMMODES 12
static SDL_Rect *SDL_modelist[SDL_NUMMODES+1];
@@ -191,6 +196,7 @@ static SDL_VideoDevice *ANDROID_CreateDevice(int devindex)
device->FreeWMCursor = ANDROID_FreeWMCursor;
device->CreateWMCursor = ANDROID_CreateWMCursor;
device->ShowWMCursor = ANDROID_ShowWMCursor;
+ device->ToggleFullScreen = ANDROID_ToggleFullScreen;
glLibraryHandle = dlopen("libGLESv1_CM.so", RTLD_NOW);
@@ -812,4 +812,15 @@ JAVA_EXPORT_NAME(Settings_nativeChmod) ( JNIEnv* env, jobject thiz, jstring j_n
int ret = chmod(name, mode);
(*env)->ReleaseStringUTFChars(env, j_name, name);
return (ret == 0);
-};
+}
+
+JNIEXPORT void JNICALL
+JAVA_EXPORT_NAME(Settings_nativeSetEnv) ( JNIEnv* env, jobject thiz, jstring j_name, jstring j_value )
+{
+ jboolean iscopy;
+ const char *name = (*env)->GetStringUTFChars(env, j_name, &iscopy);
+ const char *value = (*env)->GetStringUTFChars(env, j_value, &iscopy);
+ setenv(name, value, 1);
+ (*env)->ReleaseStringUTFChars(env, j_name, name);
+ (*env)->ReleaseStringUTFChars(env, j_value, value);
+}
@@ -115,15 +115,4 @@ JAVA_EXPORT_NAME(DemoRenderer_nativeInit) ( JNIEnv* env, jobject thiz, jstring
#endif
};
-extern C_LINKAGE void
-JAVA_EXPORT_NAME(Settings_nativeSetEnv) ( JNIEnv* env, jobject thiz, jstring j_name, jstring j_value )
-{
- jboolean iscopy;
- const char *name = (*env)->GetStringUTFChars(env, j_name, &iscopy);
- const char *value = (*env)->GetStringUTFChars(env, j_value, &iscopy);
- setenv(name, value, 1);
- (*env)->ReleaseStringUTFChars(env, j_name, name);
- (*env)->ReleaseStringUTFChars(env, j_value, value);
-}
-
#endif

0 comments on commit 999950b

Please sign in to comment.