diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 7795c64f..f418f5ce 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -15,12 +15,9 @@ jobs: - name: Setup Dependencies run: brew install ldid dpkg fakeroot - - - name: Setup Clang build - run: bash scripts/actions_setup.sh - name: Native build - run: bash scripts/build_natives_clang.sh + run: bash scripts/build_natives_cmake.sh - name: Java app Build run: bash scripts/build_javaapp.sh diff --git a/.gitignore b/.gitignore index 7cbe0770..67c6261b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,8 @@ /packages /Natives/libpojavexec.dylib -/Natives/PojavLauncher +/Natives/PojavLauncher +/Natives/build +/JavaApp/build robovm-logs/ robovm-build/ - -## Java - -*.class -*.war -*.ear -hs_err_pid* - -## Gradle -.gradle/ -/build -**/build - -## Idea -.idea/ -*.ipr -*.iws -*.iml - -.DS_STORE \ No newline at end of file +.DS_STORE diff --git a/JavaApp/ .gitignore b/JavaApp/ .gitignore deleted file mode 100644 index 9dec6f85..00000000 --- a/JavaApp/ .gitignore +++ /dev/null @@ -1,22 +0,0 @@ -robovm-logs/ -robovm-build/ - -## Java - -*.class -*.war -*.ear -hs_err_pid* - -## Gradle -.gradle/ -/build -**/build - -## Idea -.idea/ -*.ipr -*.iws -*.iml - -.DS_STORE \ No newline at end of file