update buildCLI and buildGUI win batch

GPUOpen-Tools · May 24, 2018 · 6e9387a · 6e9387a
1 parent a16350a
commit 6e9387a
Show file tree

Hide file tree

Showing 10 changed files with 243 additions and 3,403 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,11 @@
-Compressonator/Build
-Compressonator/Examples/VS2015/.vs
-Compressonator/VS2015/.vs
+Compressonator/Build/*
+Compressonator/Applications/_Plugins/C3DModel_viewers/glTF_DX12_EX/GeneratedFiles/*
+Compressonator/Applications/_Plugins/C3DModel_viewers/glTF_OpenGL/GeneratedFiles/*
+Compressonator/Applications/CompressonatorGUI/GeneratedFiles/Release_MD/*
+Compressonator/Applications/CompressonatorGUI/GeneratedFiles/Debug_MD/*
+Compressonator/Applications/CompressonatorGUI/GeneratedFiles/qrc_CompressonatorGUI.cpp
+*vcxproj.user
+*.vs
+*.log
+*.VC.db
+*.VC.VC.opendb
diff --git a/BuildCLI.bat b/BuildCLI.bat
@@ -43,7 +43,7 @@ echo --4
 set PATH=%MSBUILDDIR%;%PATH%
 echo --5
 echo -----------------------------------------------------------------------------
-echo Get MSBUILD prop path for VS2010
+echo Get MSBUILD prop path
 echo -----------------------------------------------------------------------------
 reg.exe query "HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0" /v MSBuildToolsRoot > nul 2>&1
 if ERRORLEVEL 1 goto MSBuildTest2
@@ -52,9 +52,9 @@ for /f "skip=2 tokens=2,*" %%A in ('reg.exe query "HKLM\SOFTWARE\Microsoft\MSBui
 echo --2
 set PATH=%MSBUILDROOT%\Microsoft.Cpp\v4.0\;%PATH%
 echo -----------------------------------------------------------------------------
-echo Set MSBUILD prop path for VS2012, VS2013, VS2015 
+echo Set MSBUILD prop path for VS2015 
 echo -----------------------------------------------------------------------------
-set PATH=%MSBUILDROOT%\Microsoft.Cpp\v4.0\V110\;%MSBUILDROOT%\Microsoft.Cpp\v4.0\V120\;%MSBUILDROOT%\Microsoft.Cpp\v4.0\V140\;%PATH%
+set PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Program Files\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin;%MSBUILDROOT%\Microsoft.Cpp\v4.0\V140\;%PATH%
 echo --1
 PATH >> %OUTPUT_LOG%
 echo --2
@@ -97,11 +97,11 @@ echo VS2015 Build CompressonatorCLI Exe
 echo ------------------------------------------------------------
 cd %COMPRESSONATOR_ROOT%\Applications\CompressonatorCLI\VS2015
 ::
-set Building="STEP  a2:  VS2015 Build CompressonatorCLI Win32:Release -----------------------"
+set Building="STEP  a2:  VS2015 Build CompressonatorCLI x64:Release -----------------------"
 echo --1
 echo %Building%  >> %OUTPUT_LOG%
 echo --2
-MSBUILD VS2015.sln /p:Configuration=release_md  /t:rebuild  /p:Platform=win32  /p:VCTargetsPath="%MSBUILDROOT%\Microsoft.Cpp\v4.0\V140/" >> %OUTPUT_LOG%
+msbuild /m:6 /t:rebuild /p:Configuration=Release_MD /p:Platform=x64   "VS2015.sln" >> %OUTPUT_LOG%
 IF %ERRORLEVEL% GTR 0 goto Error
 ::
 Goto Done

diff --git a/BuildGUI.bat b/BuildGUI.bat
@@ -43,7 +43,7 @@ echo --4
 set PATH=%MSBUILDDIR%;%PATH%
 echo --5
 echo -----------------------------------------------------------------------------
-echo Get MSBUILD prop path for VS2010
+echo Get MSBUILD prop path
 echo -----------------------------------------------------------------------------
 reg.exe query "HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0" /v MSBuildToolsRoot > nul 2>&1
 if ERRORLEVEL 1 goto MSBuildTest2
@@ -52,9 +52,9 @@ for /f "skip=2 tokens=2,*" %%A in ('reg.exe query "HKLM\SOFTWARE\Microsoft\MSBui
 echo --2
 set PATH=%MSBUILDROOT%\Microsoft.Cpp\v4.0\;%PATH%
 echo -----------------------------------------------------------------------------
-echo Set MSBUILD prop path for VS2012, VS2013, VS2015 
+echo Set MSBUILD prop path for VS2015 
 echo -----------------------------------------------------------------------------
-set PATH=%MSBUILDROOT%\Microsoft.Cpp\v4.0\V110\;%MSBUILDROOT%\Microsoft.Cpp\v4.0\V120\;%MSBUILDROOT%\Microsoft.Cpp\v4.0\V140\;%PATH%
+set PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Program Files\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin;%MSBUILDROOT%\Microsoft.Cpp\v4.0\V140\;%PATH%
 echo --1
 PATH >> %OUTPUT_LOG%
 echo --2
@@ -97,11 +97,11 @@ echo VS2015 Build Compressonator GUI Exe
 echo ------------------------------------------------------------
 cd %COMPRESSONATOR_ROOT%\Applications\CompressonatorGUI\VS2015
 ::
-set Building="STEP  a2:  VS2015 Build CompressonatorGUI Win32:Release_MD -----------------------"
+set Building="STEP  a2:  VS2015 Build CompressonatorGUI x64:Release_MD -----------------------"
 echo --1
 echo %Building%  >> %OUTPUT_LOG%
 echo --2
-MSBUILD VS2015.sln /p:Configuration=release_md  /t:rebuild  /p:Platform=win32  /p:VCTargetsPath="%MSBUILDROOT%\Microsoft.Cpp\v4.0\V140/" >> %OUTPUT_LOG%
+msbuild /m:6 /t:rebuild /p:Configuration=Release_MD /p:Platform=x64   "VS2015.sln" >> %OUTPUT_LOG%
 
 IF %ERRORLEVEL% GTR 0 goto Error
 

diff --git a/Compressonator/Applications/CompressonatorCLI/VS2015/Compressonator.vcxproj b/Compressonator/Applications/CompressonatorCLI/VS2015/Compressonator.vcxproj
@@ -217,7 +217,6 @@
     <ClCompile Include="../../_Plugins/Common/cmdline.cpp" />
     <ClCompile Include="../../_Plugins/Common/MIPS.cpp" />
     <ClCompile Include="../../_Plugins/Common/PluginManager.cpp" />
-    <ClCompile Include="../../_Plugins/Common/query_timer.cpp" />
     <ClCompile Include="../../_Plugins/Common/TextureIO.cpp" />
     <ClCompile Include="../Source/CompressonatorCLI.cpp" />
   </ItemGroup>

diff --git a/Compressonator/Applications/CompressonatorCLI/VS2015/Compressonator.vcxproj.filters b/Compressonator/Applications/CompressonatorCLI/VS2015/Compressonator.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClCompile Include="../../_Plugins/Common/PluginManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="../../_Plugins/Common/query_timer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="../../_Plugins/Common/TextureIO.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>