Unstaged changes (WIP)

[sdk] / samples / android / helloAndroid.epj

diff --git a/samples/android/helloAndroid.epj b/samples/android/helloAndroid.epj
index 41bc4ee..d3577e9 100644 (file)
--- a/samples/android/helloAndroid.epj
+++ b/samples/android/helloAndroid.epj
@@ -3,27 +3,42 @@
    "ModuleName" : "Hello",
    "Options" : {
       "Warnings" : "All",
-      "TargetType" : "SharedLibrary",
+      "TargetType" : "Executable",
       "TargetFileName" : "Hello",
       "Libraries" : [
-         "ecere",
-         "log",
-         "android",
-         "EGL",
-         "GLESv1_CM"
+         "ecere"
       ],
       "PostbuildCommands" : [
-         "$(call mkdirq,$(OBJ)apk/lib/armeabi)",
+         "$(call mkdirq,$(OBJ)apk/lib/armeabi-v7a)",
          "$(call mkdirq,$(OBJ)apk/lib/x86)",
-         "$(call cpv,../../ecere/obj/android.linux.$(COMPILER)/libecere.so,$(OBJ)apk/lib/armeabi)",
-         "$(call cpv,$(TARGET),$(OBJ)apk/lib/armeabi)",
-         "aapt package -v -f -m -M android/AndroidManifest.xml -F $(OBJ)$(MODULE)-unsigned.apk -I C:/android-sdk/platforms/android-20/android.jar -S android/res $(OBJ)apk",
+         "$(call cpv,../../ecere/obj/android.linux.$(COMPILER)/libecere.so,$(OBJ)apk/lib/armeabi-v7a)",
+         "$(call cpv,$(TARGET),$(OBJ)apk/lib/armeabi-v7a)",
+         "aapt package -v -f -m -M android/AndroidManifest.xml -F $(OBJ)$(MODULE)-unsigned.apk -I C:/android-sdk/platforms/android-21/android.jar -S android/res $(OBJ)apk",
          "jarsigner -storepass android -sigalg MD5withRSA -digestalg SHA1 $(OBJ)$(MODULE)-unsigned.apk -keystore C:/Users/Jerome/debug.keystore androiddebugkey -signedjar $(OBJ)$(MODULE).apk",
          "adb uninstall com.ecere.Hello",
          "adb install $(OBJ)$(MODULE).apk",
          "adb shell am start -a android.intent.action.MAIN -n com.ecere.Hello/android.app.NativeActivity"
       ]
    },
+   "Platforms" : [
+      {
+         "Name" : "linux",
+         "Options" : {
+            "Libraries" : [
+               "log",
+               "android",
+               "EGL",
+               "GLESv1_CM"
+            ]
+         }
+      },
+      {
+         "Name" : "win32",
+         "Options" : {
+            "TargetType" : "Executable"
+         }
+      }
+   ],
    "Configurations" : [
       {
          "Name" : "Debug",