Bladeren bron

examples: Maybe fix Android builds.

Ryan C. Gordon 9 maanden geleden
bovenliggende
commit
d2e2b9bdc9
1 gewijzigde bestanden met toevoegingen van 6 en 6 verwijderingen
  1. 6 6
      examples/CMakeLists.txt

+ 6 - 6
examples/CMakeLists.txt

@@ -301,7 +301,7 @@ if(ANDROID AND TARGET SDL3::Jar)
 
         include(SdlAndroidFunctions)
         sdl_create_android_debug_keystore(SDL_example-debug-keystore)
-        sdl_android_compile_resources(SDL_example-resources RESFOLDER android/res)
+        sdl_android_compile_resources(SDL_example-resources RESFOLDER ../test/android/res)
         add_custom_target(sdl-example-apks)
         foreach(EXAMPLE ${SDL_EXAMPLE_EXECUTABLES})
             set(ANDROID_MANIFEST_APP_NAME "${EXAMPLE}")
@@ -313,11 +313,11 @@ if(ANDROID AND TARGET SDL3::Jar)
             set(GENERATED_SRC_FOLDER "${CMAKE_CURRENT_BINARY_DIR}/android/${EXAMPLE}-src")
             set(GENERATED_RES_FOLDER "${GENERATED_SRC_FOLDER}/res")
             set(JAVA_PACKAGE_DIR "${GENERATED_SRC_FOLDER}/${JAVA_PACKAGE_DIR}")
-            configure_file(android/cmake/SDLEntryTestActivity.java.cmake "${JAVA_PACKAGE_DIR}/SDLEntryTestActivity.java" @ONLY)
-            configure_file(android/cmake/SDLTestActivity.java.cmake "${JAVA_PACKAGE_DIR}/SDLTestActivity.java" @ONLY)
-            configure_file(android/cmake/res/values/strings.xml.cmake android/res/values/strings-${EXAMPLE}.xml @ONLY)
-            configure_file(android/cmake/res/xml/shortcuts.xml.cmake "${GENERATED_RES_FOLDER}/xml/shortcuts.xml" @ONLY)
-            configure_file(android/cmake/AndroidManifest.xml.cmake "${generated_manifest_path}" @ONLY)
+            configure_file(../test/android/cmake/SDLEntryTestActivity.java.cmake "${JAVA_PACKAGE_DIR}/SDLEntryTestActivity.java" @ONLY)
+            configure_file(../test/android/cmake/SDLTestActivity.java.cmake "${JAVA_PACKAGE_DIR}/SDLTestActivity.java" @ONLY)
+            configure_file(../test/android/cmake/res/values/strings.xml.cmake android/res/values/strings-${EXAMPLE}.xml @ONLY)
+            configure_file(../test/android/cmake/res/xml/shortcuts.xml.cmake "${GENERATED_RES_FOLDER}/xml/shortcuts.xml" @ONLY)
+            configure_file(../test/android/cmake/AndroidManifest.xml.cmake "${generated_manifest_path}" @ONLY)
             file(GENERATE
                 OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/android/${EXAMPLE}-$<CONFIG>/res/values/strings.xml"
                 INPUT "${CMAKE_CURRENT_BINARY_DIR}/android/res/values/strings-${EXAMPLE}.xml"