From 3776dc26f51eed10e5638980da98e0cf980c3bc5 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Sat, 4 Nov 2023 16:31:59 -0400 Subject: [PATCH] Fix Building On Windows --- platforms/sdl/CMakeLists.txt | 4 ++-- platforms/sdl/android/app/build.gradle | 1 + platforms/sdl/android/app/src/main/assets/assets | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 120000 platforms/sdl/android/app/src/main/assets/assets diff --git a/platforms/sdl/CMakeLists.txt b/platforms/sdl/CMakeLists.txt index 7efcacb..62a1d02 100644 --- a/platforms/sdl/CMakeLists.txt +++ b/platforms/sdl/CMakeLists.txt @@ -92,7 +92,7 @@ endif() # Assets if(EMSCRIPTEN) - target_link_options(reminecraftpe PRIVATE --use-preload-plugins --preload-file "${CMAKE_CURRENT_SOURCE_DIR}/../../game/assets@/assets") -else() + target_link_options(reminecraftpe PRIVATE --use-preload-plugins --preload-file "${CMAKE_CURRENT_SOURCE_DIR}/../../game@/") +elseif(NOT ANDROID) file(CREATE_LINK "${CMAKE_CURRENT_SOURCE_DIR}/../../game/assets" "${CMAKE_CURRENT_BINARY_DIR}/assets" SYMBOLIC) endif() diff --git a/platforms/sdl/android/app/build.gradle b/platforms/sdl/android/app/build.gradle index 32962ce..dddb581 100644 --- a/platforms/sdl/android/app/build.gradle +++ b/platforms/sdl/android/app/build.gradle @@ -29,6 +29,7 @@ android { } sourceSets.main { java.srcDir '../../../../thirdparty/SDL2/src/android-project/app/src/main/java' + assets.srcDir '../../../../game' } externalNativeBuild { cmake { diff --git a/platforms/sdl/android/app/src/main/assets/assets b/platforms/sdl/android/app/src/main/assets/assets deleted file mode 120000 index 83c4e69..0000000 --- a/platforms/sdl/android/app/src/main/assets/assets +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../game/assets \ No newline at end of file