diff options
| -rwxr-xr-x | android-configure.sh | 14 | ||||
| -rw-r--r-- | android/build/host_executable.make | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/android-configure.sh b/android-configure.sh index febf59c..f31831c 100755 --- a/android-configure.sh +++ b/android-configure.sh @@ -202,7 +202,7 @@ if [ -n "$SDL_CONFIG" ] ; then #include <SDL.h> #undef main int main( int argc, char** argv ) { - return SDL_Init (SDL_INIT_VIDEO); + return SDL_Init (SDL_INIT_VIDEO); } EOF feature_check_link SDL_LINKING @@ -229,7 +229,7 @@ int main( int argc, char** argv ) { SDL_WM_SetPos(x, y); SDL_WM_GetMonitorDPI(&x, &y); SDL_WM_GetMonitorRect(&r); - return SDL_Init (SDL_INIT_VIDEO); + return SDL_Init (SDL_INIT_VIDEO); } EOF feature_check_link SDL_LINKING @@ -362,10 +362,20 @@ feature_check_header HAVE_FNMATCH_H "<fnmatch.h>" # Build the config.make file # +case $TARGET_OS in + windows) + TARGET_EXEEXT=.exe + ;; + *) + TARGET_EXEEXT= + ;; +esac + create_config_mk echo "" >> $config_mk echo "TARGET_ARCH := arm" >> $config_mk echo "HOST_PREBUILT_TAG := $TARGET_OS" >> $config_mk +echo "HOST_EXEEXT := $TARGET_EXEEXT" >> $config_mk echo "PREBUILT := $ANDROID_PREBUILT" >> $config_mk PWD=`pwd` diff --git a/android/build/host_executable.make b/android/build/host_executable.make index 62f4762..704da98 100644 --- a/android/build/host_executable.make +++ b/android/build/host_executable.make @@ -14,7 +14,7 @@ # # first, call a library containing all object files -LOCAL_BUILT_MODULE := $(call executable-path,$(LOCAL_MODULE)) +LOCAL_BUILT_MODULE := $(call executable-path,$(LOCAL_MODULE))$(HOST_EXEEXT) LOCAL_CC ?= $(CC) include $(BUILD_SYSTEM)/binary.make |