Skip to content

Commit

Permalink
Added BuildAll.bat / CreateRedist_All.bat, now building SSE2 and AVX …
Browse files Browse the repository at this point in the history
…builds separately. Added runtime check for compatibility, fix build for G1 (add address for zCRndD3D::Drawline), beautified stackwalker output (remove unnecessery newlines),
  • Loading branch information
kirides committed Apr 27, 2021
1 parent 6d5b3af commit 6c3d986
Show file tree
Hide file tree
Showing 14 changed files with 444 additions and 186 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -253,5 +253,5 @@ ModelManifest.xml
/PreviewBuilds/
redist*/
!/blobs/**/*.obj
/Gothic1-GD3D11-17.7-devX
/Gothic2-GD3D11-17.7-devX
/Gothic1-GD3D11-*
/Gothic2-GD3D11-*
17 changes: 17 additions & 0 deletions BuildAll.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@ECHO OFF
CD %~dp0

SET "MSBUILD=C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\amd64\MSBuild.exe"

REM RMDIR /s /q D3D11Engine\Release_AVX\
REM RMDIR /s /q D3D11Engine\Release\
REM RMDIR /s /q D3D11Engine\Release_G1_AVX\
REM RMDIR /s /q D3D11Engine\Release_G1\

"%MSBUILD%" Direct3D7Wrapper.sln /p:Configuration=Release_AVX
"%MSBUILD%" Direct3D7Wrapper.sln /p:Configuration=Release_G1_AVX

"%MSBUILD%" Direct3D7Wrapper.sln /p:Configuration=Release
"%MSBUILD%" Direct3D7Wrapper.sln /p:Configuration=Release_G1


8 changes: 0 additions & 8 deletions CreateRedistG1.bat

This file was deleted.

8 changes: 0 additions & 8 deletions CreateRedistG2.bat

This file was deleted.

27 changes: 27 additions & 0 deletions CreateRedist_All.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
@ECHO OFF
setlocal enableextensions enabledelayedexpansion

PUSHD %~dp0

SET "VERSION=17.7-dev17"

CALL :SUB_BUILD "Gothic2-GD3D11-%VERSION%_avx" "Release_AVX"
CD /D %~dp0
CALL :SUB_BUILD "Gothic1-GD3D11-%VERSION%_avx" "Release_G1_AVX"
CD /D %~dp0
CALL :SUB_BUILD "Gothic2-GD3D11-%VERSION%" "Release"
CD /D
CALL :SUB_BUILD "Gothic1-GD3D11-%VERSION%" "Release_G1"

EXIT /B

:SUB_BUILD

CALL PrepareRedist.bat %1
COPY "%2\ddraw.dll" %1
PUSHD %1
"C:\Program Files\7-Zip\7z.exe" a -tzip "..\%1.zip" "*.*" -r
POPD

EXIT /B

1 change: 1 addition & 0 deletions D3D11Engine/D3D11Engine.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,7 @@ copy "$(OutDir)$(TargetName).pdb" "$(G1_SYSTEM_PATH)\ddraw.pdb"</Command>
<ClInclude Include="include\assimp\Vertex.h" />
<ClInclude Include="include\assimp\XMLTools.h" />
<ClInclude Include="include\assimp\ZipArchiveIOSystem.h" />
<ClInclude Include="InstructionSet.h" />
<ClInclude Include="Logger.h" />
<ClInclude Include="MemoryTracker.h" />
<ClInclude Include="MeshModifier.h" />
Expand Down
3 changes: 3 additions & 0 deletions D3D11Engine/D3D11Engine.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,9 @@
<Filter>Engine\D3D11\Engine</Filter>
</ClInclude>
<ClInclude Include="D3D11_Helpers.h" />
<ClInclude Include="InstructionSet.h">
<Filter>DLLMain</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="pch.cpp" />
Expand Down
Loading

0 comments on commit 6c3d986

Please sign in to comment.