From a26003d5c0b69c6042032387cd5318e1cc9372a9 Mon Sep 17 00:00:00 2001 From: Tim Thompson Date: Wed, 29 May 2024 17:46:35 -0700 Subject: [PATCH] PALETTE_MMTT value now controls mmtt_kinect --- build/windows/build.bat | 2 +- build/windows/palette_win_setup.iss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/windows/build.bat b/build/windows/build.bat index 7ed8fba1..2ee70761 100644 --- a/build/windows/build.bat +++ b/build/windows/build.bat @@ -85,7 +85,7 @@ copy %PALETTE_SOURCE%\build\windows\vc15\bin\pthreadvc2.dll %ship%\ffgl >nul copy %PALETTE_SOURCE%\build\windows\vc15\bin\msvcr100.dll %ship%\ffgl >nul popd -if "%PALETTE_KINECT%" == "" goto no_mmtt_kinect +if not "%PALETTE_MMTT%" == "kinect" goto no_mmtt_kinect echo ================ Compiling mmtt_kinect pushd %PALETTE_SOURCE%\mmtt_kinect\build\windows msbuild /t:Build /p:Configuration=Debug /p:Platform="x32" mmtt_kinect.sln > nul diff --git a/build/windows/palette_win_setup.iss b/build/windows/palette_win_setup.iss index f0206aa5..d8fc7a84 100644 --- a/build/windows/palette_win_setup.iss +++ b/build/windows/palette_win_setup.iss @@ -47,7 +47,7 @@ Source: "ship\bin\*.bat"; DestDir: "{app}\bin"; Flags: comparetimestamp ignoreve Source: "ship\bin\*.dll"; DestDir: "{app}\bin"; Flags: comparetimestamp ignoreversion Source: "ship\bin\*.exe"; DestDir: "{app}\bin"; Flags: comparetimestamp ignoreversion Source: "ship\bin\pyinstalled\*"; DestDir: "{app}\bin\pyinstalled"; Flags: ignoreversion recursesubdirs createallsubdirs -#if "{#GetEnv('PALETTE_KINECT')}" != "" +#if "{#GetEnv('PALETTE_MMTT')}" == "kinect" Source: "ship\bin\mmtt_kinect\*"; DestDir: "{app}\bin\mmtt_kinect"; Flags: ignoreversion recursesubdirs createallsubdirs #endif Source: "ship\ffgl\*"; DestDir: "{app}\ffgl"; Flags: ignoreversion recursesubdirs createallsubdirs