Skip to content

Commit

Permalink
PALETTE_MMTT value now controls mmtt_kinect
Browse files Browse the repository at this point in the history
  • Loading branch information
nosuchtim committed May 30, 2024
1 parent 29919b7 commit a26003d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/windows/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/windows/palette_win_setup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a26003d

Please sign in to comment.