Skip to content

Commit 52d50f3

Browse files
author
nitrocaster
committed
Define xrPlatform msbuild macro, update build script.
1 parent 67d7044 commit 52d50f3

File tree

2 files changed

+64
-52
lines changed

2 files changed

+64
-52
lines changed

‎src/Common.props

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportGroup Label="PropertySheets" />
4+
<PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Win32'">
5+
<xrPlatform>Win32</xrPlatform>
6+
</PropertyGroup>
7+
<PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='x86'">
8+
<xrPlatform>Win32</xrPlatform>
9+
</PropertyGroup>
10+
<PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='x64'">
11+
<xrPlatform>Win64</xrPlatform>
12+
</PropertyGroup>
13+
<PropertyGroup Label="UserMacros" Condition="'$(xrPlatform)'==''">
14+
<xrPlatform>$(Platform)</xrPlatform>
15+
</PropertyGroup>
416
<PropertyGroup Label="UserMacros">
517
<xrBinRootDir>$(SolutionDir)..\bin\</xrBinRootDir>
618
<xrLibRootDir>$(SolutionDir)..\lib\</xrLibRootDir>
7-
<xrBinDir>$(SolutionDir)..\bin\$(Configuration)\</xrBinDir>
8-
<xrPlugBinDir>$(SolutionDir)..\bin\$(Configuration)\plugins\</xrPlugBinDir>
9-
<xrLibDir>$(SolutionDir)..\lib\$(Configuration)\</xrLibDir>
10-
<xrIntDir>$(SolutionDir)..\intermediate\$(Configuration)\</xrIntDir>
19+
<xrBinDir>$(SolutionDir)..\bin\$(xrPlatform)\$(Configuration)\</xrBinDir>
20+
<xrPlugBinDir>$(SolutionDir)..\bin\$(xrPlatform)\$(Configuration)\plugins\</xrPlugBinDir>
21+
<xrLibDir>$(SolutionDir)..\lib\$(xrPlatform)\$(Configuration)\</xrLibDir>
22+
<xrIntDir>$(SolutionDir)..\intermediate\$(xrPlatform)\$(Configuration)\</xrIntDir>
1123
<xrSdkDir>$(SolutionDir)..\sdk\</xrSdkDir>
1224
</PropertyGroup>
1325
<PropertyGroup>

‎xrbinup.cmd

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ set null_args=0
77
if [%1]==[] set null_args=1
88
if [%2]==[] set null_args=1
99
if [%3]==[] set null_args=1
10+
if [%4]==[] set null_args=1
1011
if !null_args!==1 (
11-
echo usage: %0 ^<game_installation_dir^> ^<repository_root_dir^> {dbg^|mix^|rel}
12+
echo usage: %0 ^<game_installation_dir^> ^<repository_root_dir^> {Win32^|Win64} {Debug^|Mixed^|Release}
1213
goto ret
1314
)
1415
if not exist %1 (
@@ -19,63 +20,62 @@ if not exist %2 (
1920
echo path not found: %2
2021
goto ret
2122
)
22-
set cfg=%3
23-
set cfg_valid=0
24-
if %cfg%==dbg set cfg_valid=1
25-
if %cfg%==mix set cfg_valid=1
26-
if %cfg%==rel set cfg_valid=1
27-
if !cfg_valid!==1 goto args_validated
28-
echo invalid configuration: %cfg%
29-
goto ret
23+
set platform=%3
24+
if %platform%==Win32 (
25+
) else if %platform%==Win64 (
26+
) else (
27+
echo invalid platform: %platform%
28+
goto ret
29+
)
3030

31-
:args_validated
32-
set src=%2\bin
33-
if %cfg%==dbg (
34-
set cfg_long=Debug
31+
set cfg=%4
32+
if %cfg%==Debug (
3533
set dst=%1\_bin_dbg
36-
set dbg=1
37-
) else if %cfg%==mix (
38-
set cfg_long=Mixed
34+
) else if %cfg%==Mixed (
3935
set dst=%1\_bin_mix
40-
) else if %cfg%==rel (
41-
set cfg_long=Release
36+
) else if %cfg%==Release (
4237
set dst=%1\_bin_rel
38+
) else (
39+
echo invalid configuration: %cfg%
40+
goto ret
4341
)
42+
set dst=%dst%\%platform%
43+
set src=%2\bin\%platform%\%cfg%
4444

4545
set cp_tool=cp
4646

47-
%cp_tool% %src%\%cfg_long%\xrEngine.exe %dst%\xrEngine.exe
48-
%cp_tool% %src%\%cfg_long%\xrAPI.dll %dst%\xrAPI.dll
49-
%cp_tool% %src%\%cfg_long%\xrCore.dll %dst%\xrCore.dll
50-
%cp_tool% %src%\%cfg_long%\xrCDB.dll %dst%\xrCDB.dll
51-
%cp_tool% %src%\%cfg_long%\xrSound.dll %dst%\xrSound.dll
52-
%cp_tool% %src%\%cfg_long%\xrParticles.dll %dst%\xrParticles.dll
53-
%cp_tool% %src%\%cfg_long%\xrPhysics.dll %dst%\xrPhysics.dll
54-
%cp_tool% %src%\%cfg_long%\xrD3D9-Null.dll %dst%\xrD3D9-Null.dll
55-
%cp_tool% %src%\%cfg_long%\xrAICore.dll %dst%\xrAICore.dll
56-
%cp_tool% %src%\%cfg_long%\xrScriptEngine.dll %dst%\xrScriptEngine.dll
57-
%cp_tool% %src%\%cfg_long%\xrGame.dll %dst%\xrGame.dll
58-
%cp_tool% %src%\%cfg_long%\xrGameSpy.dll %dst%\xrGameSpy.dll
59-
%cp_tool% %src%\%cfg_long%\xrNetServer.dll %dst%\xrNetServer.dll
60-
%cp_tool% %src%\%cfg_long%\xrRender_R1.dll %dst%\xrRender_R1.dll
61-
%cp_tool% %src%\%cfg_long%\xrRender_R2.dll %dst%\xrRender_R2.dll
62-
%cp_tool% %src%\%cfg_long%\xrRender_R3.dll %dst%\xrRender_R3.dll
63-
%cp_tool% %src%\%cfg_long%\xrRender_R4.dll %dst%\xrRender_R4.dll
64-
%cp_tool% %src%\%cfg_long%\xrXMLParser.dll %dst%\xrXMLParser.dll
47+
%cp_tool% %src%\xrEngine.exe %dst%\xrEngine.exe
48+
%cp_tool% %src%\xrAPI.dll %dst%\xrAPI.dll
49+
%cp_tool% %src%\xrCore.dll %dst%\xrCore.dll
50+
%cp_tool% %src%\xrCDB.dll %dst%\xrCDB.dll
51+
%cp_tool% %src%\xrSound.dll %dst%\xrSound.dll
52+
%cp_tool% %src%\xrParticles.dll %dst%\xrParticles.dll
53+
%cp_tool% %src%\xrPhysics.dll %dst%\xrPhysics.dll
54+
%cp_tool% %src%\xrD3D9-Null.dll %dst%\xrD3D9-Null.dll
55+
%cp_tool% %src%\xrAICore.dll %dst%\xrAICore.dll
56+
%cp_tool% %src%\xrScriptEngine.dll %dst%\xrScriptEngine.dll
57+
%cp_tool% %src%\xrGame.dll %dst%\xrGame.dll
58+
%cp_tool% %src%\xrGameSpy.dll %dst%\xrGameSpy.dll
59+
%cp_tool% %src%\xrNetServer.dll %dst%\xrNetServer.dll
60+
%cp_tool% %src%\xrRender_R1.dll %dst%\xrRender_R1.dll
61+
%cp_tool% %src%\xrRender_R2.dll %dst%\xrRender_R2.dll
62+
%cp_tool% %src%\xrRender_R3.dll %dst%\xrRender_R3.dll
63+
%cp_tool% %src%\xrRender_R4.dll %dst%\xrRender_R4.dll
64+
%cp_tool% %src%\xrXMLParser.dll %dst%\xrXMLParser.dll
6565
rem CxImage is compiled as DLLs only in debug configuration
66-
if defined dbg (
67-
%cp_tool% %src%\%cfg_long%\CxImage.dll %dst%\CxImage.dll
66+
if %cfg%==Debug (
67+
%cp_tool% %src%\CxImage.dll %dst%\CxImage.dll
6868
)
69-
%cp_tool% %src%\%cfg_long%\Lua.JIT.1.1.4.dll %dst%\Lua.JIT.1.1.4.dll
70-
%cp_tool% %src%\%cfg_long%\LuaBind.beta7-Devel.RC4.dll %dst%\LuaBind.beta7-Devel.RC4.dll
71-
%cp_tool% %src%\%cfg_long%\ODE.dll %dst%\ODE.dll
72-
%cp_tool% %src%\%cfg_long%\OpenAL32.dll %dst%\OpenAL32.dll
73-
%cp_tool% %src%\%cfg_long%\OpenAL32.dll %dst%\dedicated\OpenAL32.dll
74-
%cp_tool% %src%\%cfg_long%_Dedicated\dedicated\xrEngine.exe %dst%\dedicated\xrEngine.exe
75-
%cp_tool% %src%\%cfg_long%\xrWeatherEditor.dll %dst%\xrWeatherEditor.dll
76-
%cp_tool% %src%\%cfg_long%\xrManagedApi.dll %dst%\xrManagedApi.dll
77-
%cp_tool% %src%\%cfg_long%\xrSdkControls.dll %dst%\xrSdkControls.dll
78-
%cp_tool% %src%\%cfg_long%\xrPostprocessEditor.exe %dst%\xrPostprocessEditor.exe
69+
%cp_tool% %src%\LuaJIT.dll %dst%\LuaJIT.dll
70+
%cp_tool% %src%\LuaBind.dll %dst%\LuaBind.dll
71+
%cp_tool% %src%\ODE.dll %dst%\ODE.dll
72+
%cp_tool% %src%\OpenAL32.dll %dst%\OpenAL32.dll
73+
%cp_tool% %src%\OpenAL32.dll %dst%\dedicated\OpenAL32.dll
74+
%cp_tool% %src%_Dedicated\dedicated\xrEngine.exe %dst%\dedicated\xrEngine.exe
75+
%cp_tool% %src%\xrWeatherEditor.dll %dst%\xrWeatherEditor.dll
76+
%cp_tool% %src%\xrManagedApi.dll %dst%\xrManagedApi.dll
77+
%cp_tool% %src%\xrSdkControls.dll %dst%\xrSdkControls.dll
78+
%cp_tool% %src%\xrPostprocessEditor.exe %dst%\xrPostprocessEditor.exe
7979

8080
:ret
8181
endlocal

0 commit comments

Comments
 (0)