From 703c467647e6fea6abcbebb7d827a54ff5323cfd Mon Sep 17 00:00:00 2001 From: Adam Tunnic Date: Wed, 28 Apr 2021 17:16:39 -0400 Subject: [PATCH] CMake with ARC enabled 2 --- JavaApp/build/gen/BuildConfig.java | 6 ----- JavaApp/gradlew | 0 Natives/CMakeLists.txt | 2 +- Natives/en.lproj/MinecraftSurface.storyboard | 26 +++++++++++--------- scripts/actions_setup.sh | 0 scripts/build_javaapp.sh | 0 scripts/build_natives_clang.sh | 2 +- scripts/build_natives_cmake.sh | 0 scripts/build_package.sh | 0 9 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 JavaApp/build/gen/BuildConfig.java mode change 100644 => 100755 JavaApp/gradlew mode change 100644 => 100755 scripts/actions_setup.sh mode change 100644 => 100755 scripts/build_javaapp.sh mode change 100644 => 100755 scripts/build_natives_cmake.sh mode change 100644 => 100755 scripts/build_package.sh diff --git a/JavaApp/build/gen/BuildConfig.java b/JavaApp/build/gen/BuildConfig.java deleted file mode 100644 index 8bb62abb..00000000 --- a/JavaApp/build/gen/BuildConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -/** Automatically generated file. DO NOT MODIFY */ -package ; - -public final class BuildConfig { - public final static boolean DEBUG = true; -} \ No newline at end of file diff --git a/JavaApp/gradlew b/JavaApp/gradlew old mode 100644 new mode 100755 diff --git a/Natives/CMakeLists.txt b/Natives/CMakeLists.txt index f66d030e..4f311ced 100644 --- a/Natives/CMakeLists.txt +++ b/Natives/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.6) project(PojavLauncher) # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -set(CMAKE_C_FLAGS "-fobjc-arc x objective-c -Iresources/Frameworks/MetalANGLE.framework/Headers") +set(CMAKE_C_FLAGS "-fobjc-arc -x objective-c -Iresources/Frameworks/MetalANGLE.framework/Headers") add_executable(PojavLauncher main.c log.m JavaLauncher.c) target_link_libraries(PojavLauncher diff --git a/Natives/en.lproj/MinecraftSurface.storyboard b/Natives/en.lproj/MinecraftSurface.storyboard index ede14ce9..0a3373b9 100644 --- a/Natives/en.lproj/MinecraftSurface.storyboard +++ b/Natives/en.lproj/MinecraftSurface.storyboard @@ -1,26 +1,28 @@ - - + + + - + + - + + + + + - + - + + - - - - - - \ No newline at end of file + diff --git a/scripts/actions_setup.sh b/scripts/actions_setup.sh old mode 100644 new mode 100755 diff --git a/scripts/build_javaapp.sh b/scripts/build_javaapp.sh old mode 100644 new mode 100755 diff --git a/scripts/build_natives_clang.sh b/scripts/build_natives_clang.sh index c7c1b8b5..b567dc17 100755 --- a/scripts/build_natives_clang.sh +++ b/scripts/build_natives_clang.sh @@ -4,7 +4,7 @@ set -e # Compile natives cd Natives -CFLAGS="-arch arm64 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -Wno-trigraphs -fpascal-strings -miphoneos-version-min=12.0 -O3 -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-return-type -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wno-empty-body -Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wno-constant-conversion -Wno-int-conversion -Wno-bool-conversion -Wno-enum-conversion -Wno-float-conversion -Wno-non-literal-null-conversion -Wno-objc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wl,-rpath,/Applications/PojavLauncher.app/Frameworks -fobjc-arc -x objective-c -Fresources/Frameworks -Iresources/Frameworks/MetalANGLE.framework/Headers -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.7.sdk" +CFLAGS="-arch arm64 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -Wno-trigraphs -fpascal-strings -miphoneos-version-min=12.0 -O3 -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-return-type -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wno-empty-body -Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wno-constant-conversion -Wno-int-conversion -Wno-bool-conversion -Wno-enum-conversion -Wno-float-conversion -Wno-non-literal-null-conversion -Wno-objc-literal-conversion -Wshorten-64-to-32 -Wpointer-sign -Wno-newline-eof -Wl,-rpath,/Applications/PojavLauncher.app/Frameworks -fobjc-arc -x objective-c -Fresources/Frameworks -Iresources/Frameworks/MetalANGLE.framework/Headers -isysroot ../iPhoneOS13.4.sdk" clang -framework UIKit $CFLAGS -o PojavLauncher main.c log.m JavaLauncher.c clang -framework UIKit -framework MetalANGLE -framework CoreGraphics -framework AuthenticationServices -dynamiclib $CFLAGS -o libpojavexec.dylib log.m AppDelegate.m SceneDelegate.m UILauncher.m LauncherViewController.m LoginViewController.m SurfaceViewController.m egl_bridge_ios.m ios_uikit_bridge.m customcontrols/ControlButton.m egl_bridge.c input_bridge_v3.c utils.c -DGLES_TESTZ -DUSE_EGLZ -Wl,-undefined,dynamic_lookup diff --git a/scripts/build_natives_cmake.sh b/scripts/build_natives_cmake.sh old mode 100644 new mode 100755 diff --git a/scripts/build_package.sh b/scripts/build_package.sh old mode 100644 new mode 100755