diff --git a/.gitignore b/.gitignore index d1e77c5ae..5a083faef 100644 --- a/.gitignore +++ b/.gitignore @@ -14,8 +14,9 @@ data/studio.ini .lumixuser *.unv.bak projects/3rdparty +!projects/bin/ plugins/ src/engine/plugins.inl data/.shader_cache_dx11 projects/itch_io/ -!data/editor/scripts/plugins/ \ No newline at end of file +!data/editor/scripts/plugins/ diff --git a/projects/bin/darwin/genie b/projects/bin/darwin/genie new file mode 100755 index 000000000..1ee53bd61 Binary files /dev/null and b/projects/bin/darwin/genie differ diff --git a/projects/genie b/projects/bin/linux/genie similarity index 100% rename from projects/genie rename to projects/bin/linux/genie diff --git a/projects/genie.exe b/projects/bin/windows/genie.exe similarity index 100% rename from projects/genie.exe rename to projects/bin/windows/genie.exe diff --git a/projects/main.bat b/projects/main.bat index d40700146..52ed3639f 100644 --- a/projects/main.bat +++ b/projects/main.bat @@ -354,7 +354,7 @@ exit /B 0 :build_basisu pushd 3rdparty\basisu\lumix\ - ..\..\..\genie.exe vs2022 + ..\..\..\bin\windows\genie.exe vs2022 popd %msbuild_cmd% 3rdparty\basisu\lumix\vs2022\basis_lumix.sln /p:Configuration="Release" /p:Platform=x64 exit /B 0 @@ -493,13 +493,13 @@ goto :recast exit /B 0 :build_recast - genie.exe --file=recastnavigation.lua vs2022 + .\bin\windows\genie.exe --file=recastnavigation.lua vs2022 %msbuild_cmd% 3rdparty\recast\_project\RecastDetour.sln /p:Configuration=Release /p:Platform=x64 exit /B 0 :create_project echo Creating project... - genie.exe --with-app vs2022 + ,\bin\windows\genie.exe --with-app vs2022 pause exit /B 0 @@ -524,7 +524,7 @@ exit /B 0 :create_bundle echo Creating bundle... - genie.exe --embed-resources --static-physx vs2022 + .\bin\windows\genie.exe --embed-resources --static-physx vs2022 cd ..\data tar -cvf data.tar . move data.tar ../src/studio diff --git a/projects/main.sh b/projects/main.sh index f2ec44a02..60e8d2e6a 100755 --- a/projects/main.sh +++ b/projects/main.sh @@ -35,7 +35,7 @@ download_plugin() build_recast() { - ./genie --file=recastnavigation.lua gmake + ./bin/$"OS"/genie --file=recastnavigation.lua gmake pushd 3rdparty/recast/_project make popd @@ -176,7 +176,7 @@ push_to_itch_io() git clean -f -x -d ../data/ rm -rf itch_io mkdir itch_io - ./genie gmake + ./bin/"$OS"/genie gmake cd tmp/gmake make -j config=relwithdebinfo64 cd ../.. @@ -211,11 +211,15 @@ main_menu() { clear; PS3="Wut? " + OS="linux" + if [[ "$OSTYPE" == "darwin"* ]]; then + OS="darwin" + fi options=("create project" "build release" "build debug" "3rdparty", "push to itch.io", "plugins", "exit") select opt in "${options[@]}" do case "$REPLY" in - 1 ) ./genie gmake; pause; break;; + 1 ) ./bin/"$OS"/genie gmake; pause; break;; 2 ) build relwithdebinfo64; pause; break;; 3 ) build debug64; pause; break;; 4 ) thirdparty_menu; break;; diff --git a/projects/publish_to_itch_io.bat b/projects/publish_to_itch_io.bat index a85ff1fad..166ba17e8 100644 --- a/projects/publish_to_itch_io.bat +++ b/projects/publish_to_itch_io.bat @@ -51,7 +51,7 @@ if not %errorlevel%==0 pause popd REM create engine project -genie.exe --static-physx --with-app --nodx vs2022 +bin/windows/genie.exe --static-physx --with-app --nodx vs2022 if not %errorlevel%==0 pause REM build studio.exe @@ -69,7 +69,7 @@ butler.exe push itch_io mikulasflorek/lumix-engine:win-64-gl if not %errorlevel%==0 pause REM create engine project -genie.exe --static-physx --with-app vs2022 +bin/windows/genie.exe --static-physx --with-app vs2022 if not %errorlevel%==0 pause REM build studio.exe