From a4e24ecadbacec80ef450d546d101bdff5d1f35e Mon Sep 17 00:00:00 2001 From: apistol78 Date: Thu, 29 Feb 2024 16:00:50 +0100 Subject: [PATCH] Traktor: Using msbuild when building from VS code on windows. --- scripts/build-projects-fbuild-win64.bat | 29 ------------------------- scripts/build-vscode.bat | 20 ++++++++--------- scripts/config.bat | 6 ----- 3 files changed, 9 insertions(+), 46 deletions(-) delete mode 100755 scripts/build-projects-fbuild-win64.bat diff --git a/scripts/build-projects-fbuild-win64.bat b/scripts/build-projects-fbuild-win64.bat deleted file mode 100755 index 4c79c2f94e..0000000000 --- a/scripts/build-projects-fbuild-win64.bat +++ /dev/null @@ -1,29 +0,0 @@ -@echo off - -call %~dp0config.bat - -:: \hack Setup paths to ABI specific binaries. -set FBX_SDK_LIBPATH=%FBX_SDK%\lib\vs2017\x64\release -set P4_DEBUG_SDK=%TRAKTOR_HOME%\3rdp\p4api-2020.1.1953492-vs2017_dyn_vsdebug -set P4_RELEASE_SDK=%TRAKTOR_HOME%\3rdp\p4api-2020.1.1953492-vs2017_dyn - -:: Optional parameters. -set FBUILD_MANIFEST=%TRAKTOR_HOME%\resources\build\windows\manifest-win64.xml - -:: Mandatory parameters. -set FBUILD_INCLUDE=$(TRAKTOR_HOME)\resources\build\configurations\fbuild-config-win64-no-debug.bff - -%SOLUTIONBUILDER% ^ - -f=fbuild ^ - -fastbuild-solution-template=%TRAKTOR_HOME%\resources\build\configurations\fbuild-solution.sb ^ - -fastbuild-project-template=%TRAKTOR_HOME%\resources\build\configurations\fbuild-project.sb ^ - %TRAKTOR_HOME%\resources\build\ExternWin64.xms - -:: Mandatory parameters. -set FBUILD_INCLUDE=$(TRAKTOR_HOME)\resources\build\configurations\fbuild-config-win64.bff - -%SOLUTIONBUILDER% ^ - -f=fbuild ^ - -fastbuild-solution-template=%TRAKTOR_HOME%\resources\build\configurations\fbuild-solution.sb ^ - -fastbuild-project-template=%TRAKTOR_HOME%\resources\build\configurations\fbuild-project.sb ^ - %TRAKTOR_HOME%\resources\build\TraktorWin64.xms diff --git a/scripts/build-vscode.bat b/scripts/build-vscode.bat index a3f5dfdc6b..adfdc8ef32 100755 --- a/scripts/build-vscode.bat +++ b/scripts/build-vscode.bat @@ -4,22 +4,20 @@ set PLATFORM=%1 set CONFIG=%2 call %~dp0config.bat +call %~dp0config-vs-x64.bat -echo Building... +echo Building %CONFIG%... echo %TRAKTOR_HOME% -echo %FBUILD% if "%PLATFORM%" == "Windows" ( - call %~dp0config-vs-x64.bat - pushd "%TRAKTOR_HOME%\build\win64" - %FBUILD% -config "Extern Win64.bff" -noprogress -cache %CONFIG% - %FBUILD% -config "Traktor Win64.bff" -noprogress -cache %CONFIG% - popd + pushd "%TRAKTOR_HOME%\build\win64" + msbuild -m "Traktor Win64.sln" /p:Configuration=%CONFIG% /p:Platform="x64" + popd ) if "%PLATFORM%" == "Android" ( - pushd "%TRAKTOR_HOME%\build\android" - %TRAKTOR_HOME%\3rdp\jom-windows\jom /L /F "Extern Android.mak" %CONFIG% - %TRAKTOR_HOME%\3rdp\jom-windows\jom /L /F "Traktor Android.mak" %CONFIG% - popd + pushd "%TRAKTOR_HOME%\build\android" + %TRAKTOR_HOME%\3rdp\jom-windows\jom /L /F "Extern Android.mak" %CONFIG% + %TRAKTOR_HOME%\3rdp\jom-windows\jom /L /F "Traktor Android.mak" %CONFIG% + popd ) diff --git a/scripts/config.bat b/scripts/config.bat index b5218b36dc..1daa9f45b6 100755 --- a/scripts/config.bat +++ b/scripts/config.bat @@ -49,12 +49,6 @@ set VMA_SDK=%TRAKTOR_HOME%\3rdp\VulkanMemoryAllocator :: Export name of solution builder binary. set SOLUTIONBUILDER=%TRAKTOR_HOME%\bin\win64\releasestatic\Traktor.SolutionBuilder.App -:: Export path to Ninja binary. -set NINJA=%TRAKTOR_HOME%\3rdp\ninja-windows\ninja - -:: Export path to FBuild executable. -set FBUILD=%TRAKTOR_HOME%\3rdp\fastbuild-windows\FBuild.exe - :: Android SDK set ANDROID_HOME=%TRAKTOR_HOME:\=/%/3rdp/android-sdk-windows set ANDROID_NDK_ROOT=%ANDROID_HOME:\=/%/ndk-bundle