diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ddde5b8..afc9ab8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -205,7 +205,7 @@ jobs: export PATH=$ANDROID_HOME/ndk/$NDK_VER:$PATH export OUTPUT=$PWD/SDL3-CS/native/android rm -rf $OUTPUT && mkdir -p $OUTPUT - + # Build SDL3 sed -i 's/abi=.*/abi="armeabi-v7a arm64-v8a x86 x86_64"/g' ./build-scripts/androidbuildlibs.sh ./build-scripts/androidbuildlibs.sh NDK_LIBS_OUT="$OUTPUT" @@ -214,7 +214,7 @@ jobs: run: | export JAVA_HOME=$JAVA_HOME_11_X64 export PATH=$JAVA_HOME_11_X64/bin:$PATH - export OUTPUT=$PWD/SDL3-CS/SDL3-CS-Android/Jars/ + export OUTPUT=$PWD/SDL3-CS/SDL3-CS.Android/Jars/ rm -rf $OUTPUT && mkdir -p $OUTPUT # Build SDL3 Android Java part diff --git a/SDL3-CS-Android/Additions/AboutAdditions.txt b/SDL3-CS.Android/Additions/AboutAdditions.txt similarity index 100% rename from SDL3-CS-Android/Additions/AboutAdditions.txt rename to SDL3-CS.Android/Additions/AboutAdditions.txt diff --git a/SDL3-CS-Android/SDL3-CS-Android.csproj b/SDL3-CS.Android/SDL3-CS.Android.csproj similarity index 91% rename from SDL3-CS-Android/SDL3-CS-Android.csproj rename to SDL3-CS.Android/SDL3-CS.Android.csproj index c304bdd..40f50fd 100644 --- a/SDL3-CS-Android/SDL3-CS-Android.csproj +++ b/SDL3-CS.Android/SDL3-CS.Android.csproj @@ -2,7 +2,7 @@ net8.0-android 21 - SDL3_CS_Android + SDL3.Android enable enable @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/SDL3-CS-Android/Transforms/EnumFields.xml b/SDL3-CS.Android/Transforms/EnumFields.xml similarity index 100% rename from SDL3-CS-Android/Transforms/EnumFields.xml rename to SDL3-CS.Android/Transforms/EnumFields.xml diff --git a/SDL3-CS-Android/Transforms/EnumMethods.xml b/SDL3-CS.Android/Transforms/EnumMethods.xml similarity index 100% rename from SDL3-CS-Android/Transforms/EnumMethods.xml rename to SDL3-CS.Android/Transforms/EnumMethods.xml diff --git a/SDL3-CS-Android/Transforms/Metadata.xml b/SDL3-CS.Android/Transforms/Metadata.xml similarity index 100% rename from SDL3-CS-Android/Transforms/Metadata.xml rename to SDL3-CS.Android/Transforms/Metadata.xml diff --git a/SDL3-CS.sln b/SDL3-CS.sln index 6b4a898..a9e57ab 100644 --- a/SDL3-CS.sln +++ b/SDL3-CS.sln @@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDL3-CS.SourceGeneration", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDL3-CS.Tests", "SDL3-CS.Tests\SDL3-CS.Tests.csproj", "{CF980481-8227-4BED-970E-6433C83F64CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL3-CS-Android", "SDL3-CS-Android\SDL3-CS-Android.csproj", "{CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL3-CS.Android", "SDL3-CS.Android\SDL3-CS.Android.csproj", "{CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution