Traktor: Using msbuild when building from VS code on windows.

apistol78 · Feb 29, 2024 · a4e24ec · a4e24ec
1 parent 431fc06
commit a4e24ec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 46 deletions.
diff --git a/scripts/build-projects-fbuild-win64.bat b/scripts/build-projects-fbuild-win64.bat
diff --git 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
@@ -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