From 02da29b5382828c5f0c241a8f742af3cdf028adc Mon Sep 17 00:00:00 2001 From: swd Date: Sat, 23 Mar 2024 00:09:19 +0900 Subject: [PATCH] Use launcher in Windows (#1005) Use launcher in Windows --- Tool/EffekseerLauncher/build_windows.bat | 3 +++ build.py | 6 ++++- release_tool.bat | 33 +++++++++++++----------- 3 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 Tool/EffekseerLauncher/build_windows.bat diff --git a/Tool/EffekseerLauncher/build_windows.bat b/Tool/EffekseerLauncher/build_windows.bat new file mode 100644 index 0000000000..7dbefbab1f --- /dev/null +++ b/Tool/EffekseerLauncher/build_windows.bat @@ -0,0 +1,3 @@ +cmake -B build_windows -S . +cd build_windows +cmake --build . --config Release diff --git a/build.py b/build.py index 60624b60a7..fa43e734ff 100755 --- a/build.py +++ b/build.py @@ -134,6 +134,10 @@ def __exit__(self, type, value, traceback): is_x86 = env['X86'] == '1' is_from_ci = 'from_ci' in sys.argv +if isWin(): + with CurrentDir('Tool/EffekseerLauncher'): + call('call build_windows.bat') + if isMac(): with CurrentDir('Tool/EffekseerLauncher'): call('sh build_macosx.sh') @@ -184,7 +188,7 @@ def __exit__(self, type, value, traceback): call('chmod +x Dev/release/tools/libfbxsdk.so') call('cp -r Dev/release/linux-x64/publish/* Dev/release/') call('rm -rf -r Dev/release/linux-x64') - + if env['PACKAGEING_FOR_MAC'] == '1' and isMac(): cd('Dev') mkdir('Mac/Effekseer.app/Contents/Resources/') diff --git a/release_tool.bat b/release_tool.bat index 891aea1849..ca6368d709 100644 --- a/release_tool.bat +++ b/release_tool.bat @@ -8,27 +8,30 @@ echo Compile Editor echo Copy application mkdir %RDIR%\Tool +mkdir %RDIR%\Tool\bin -robocopy Dev\release %RDIR%\Tool +robocopy Dev\release %RDIR%\Tool\bin -mkdir %RDIR%\Tool\scripts -mkdir %RDIR%\Tool\scripts\export -copy Dev\release\scripts\export\Default.cs %RDIR%\Tool\scripts\export\. +mkdir %RDIR%\Tool\bin\scripts +mkdir %RDIR%\Tool\bin\scripts\export +copy Dev\release\scripts\export\Default.cs %RDIR%\Tool\bin\scripts\export\. -mkdir %RDIR%\Tool\tools -copy Dev\release\tools\fbxToEffekseerCurveConverter.exe %RDIR%\Tool\tools\. -copy Dev\release\tools\fbxToEffekseerModelConverter.exe %RDIR%\Tool\tools\. -copy Dev\release\tools\libfbxsdk.dll %RDIR%\Tool\tools\. +mkdir %RDIR%\Tool\bin\tools +copy Dev\release\tools\fbxToEffekseerCurveConverter.exe %RDIR%\Tool\bin\tools\. +copy Dev\release\tools\fbxToEffekseerModelConverter.exe %RDIR%\Tool\bin\tools\. +copy Dev\release\tools\libfbxsdk.dll %RDIR%\Tool\bin\tools\. -copy Dev\release\tools\EffekseerMaterialCompilerDX9.dll %RDIR%\Tool\tools\. -copy Dev\release\tools\EffekseerMaterialCompilerDX11.dll %RDIR%\Tool\tools\. -copy Dev\release\tools\EffekseerMaterialCompilerDX12.dll %RDIR%\Tool\tools\. -copy Dev\release\tools\EffekseerMaterialCompilerGL.dll %RDIR%\Tool\tools\. -copy Dev\release\tools\EffekseerMaterialCompilerMetal.dll %RDIR%\Tool\tools\. +copy Dev\release\tools\EffekseerMaterialCompilerDX9.dll %RDIR%\Tool\bin\tools\. +copy Dev\release\tools\EffekseerMaterialCompilerDX11.dll %RDIR%\Tool\bin\tools\. +copy Dev\release\tools\EffekseerMaterialCompilerDX12.dll %RDIR%\Tool\bin\tools\. +copy Dev\release\tools\EffekseerMaterialCompilerGL.dll %RDIR%\Tool\bin\tools\. +copy Dev\release\tools\EffekseerMaterialCompilerMetal.dll %RDIR%\Tool\bin\tools\. -mkdir %RDIR%\Tool\resources -robocopy Dev\release\resources\ %RDIR%\Tool\resources\. /s +mkdir %RDIR%\Tool\bin\resources +robocopy Dev\release\resources\ %RDIR%\Tool\bin\resources\. /s + +copy Tool\EffekseerLauncher\build_windows\Release\EffekseerLauncher.exe %RDIR%\Tool\Effekseer.exe echo Sample