Skip to content

Commit 2136d98

Browse files
tamlin-mikeXottab-DUTY
tamlin-mike
authored and
Xottab-DUTY
committed
Move src/Externals to Externals.
1 parent 53b0f96 commit 2136d98

File tree

143 files changed

+854
-450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+854
-450
lines changed

‎Externals/.gitignore‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# exclude third-party libraries (except submodules)
2+
3dsmax
3+
BugTrap
4+
FreeImage
5+
jpeg
6+
libogg-1.1.4
7+
libtheora-1.1.1
8+
libvorbis-1.2.3
9+
lightwave
10+
MagicSoftware
11+
maya
12+
nvapi
13+
OpenAutomate
14+
OpenSSL
15+
zlib

‎Externals/lzo.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<Keyword>Win32Proj</Keyword>
9393
<RootNamespace>lzo</RootNamespace>
9494
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
95-
<ProjectName>lzo2</ProjectName>
95+
<ProjectName>lzo</ProjectName>
9696
</PropertyGroup>
9797
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
9898
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -128,19 +128,19 @@
128128
</ImportGroup>
129129
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
130130
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
131-
<Import Project="..\Common.props" />
131+
<Import Project="$(SolutionDir)Common.props" />
132132
</ImportGroup>
133133
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
134134
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
135-
<Import Project="..\Common.props" />
135+
<Import Project="$(SolutionDir)Common.props" />
136136
</ImportGroup>
137137
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
138138
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
139-
<Import Project="..\Common.props" />
139+
<Import Project="$(SolutionDir)Common.props" />
140140
</ImportGroup>
141141
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
142142
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
143-
<Import Project="..\Common.props" />
143+
<Import Project="$(SolutionDir)Common.props" />
144144
</ImportGroup>
145145
<PropertyGroup Label="UserMacros" />
146146
<PropertyGroup />

‎Externals/openal/OpenAL-Windows/Router/Router.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</Midl>
7777
<ClCompile>
7878
<Optimization>Disabled</Optimization>
79-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\openal\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
79+
<AdditionalIncludeDirectories>$(xrExternals)\openal\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8080
<PreprocessorDefinitions>_USRDLL;ROUTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8181
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
8282
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -118,7 +118,7 @@
118118
<OmitFramePointers>true</OmitFramePointers>
119119
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
120120
<WholeProgramOptimization>true</WholeProgramOptimization>
121-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\openal\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
121+
<AdditionalIncludeDirectories>$(xrExternals)\openal\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
122122
<PreprocessorDefinitions>_USRDLL;ROUTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123123
<StringPooling>true</StringPooling>
124124
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -163,7 +163,7 @@
163163
<OmitFramePointers>true</OmitFramePointers>
164164
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
165165
<WholeProgramOptimization>true</WholeProgramOptimization>
166-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\openal\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
166+
<AdditionalIncludeDirectories>$(xrExternals)\openal\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
167167
<PreprocessorDefinitions>_USRDLL;ROUTER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
168168
<StringPooling>true</StringPooling>
169169
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

‎src/Common.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<xrLibDir>$(SolutionDir)..\lib\$(xrPlatform)\$(Configuration)\</xrLibDir>
2424
<xrIntDir>$(SolutionDir)..\intermediate\$(xrPlatform)\$(Configuration)\</xrIntDir>
2525
<xrSdkDir>$(SolutionDir)..\sdk\</xrSdkDir>
26+
<xrExternals>$(SolutionDir)..\Externals\</xrExternals>
2627
</PropertyGroup>
2728
<PropertyGroup Condition="'$(ConfigurationType)'=='Application'">
2829
<OutDir>$(xrBinDir)</OutDir>
@@ -41,7 +42,7 @@
4142
</PropertyGroup>
4243
<ItemDefinitionGroup>
4344
<ClCompile>
44-
<AdditionalIncludeDirectories>$(SolutionDir);$(ProjectDir);$(xrSdkDir)include;$(SolutionDir)Externals;$(DXSDK_DIR)Include;$(SolutionDir)Externals\luajit\src;$(SolutionDir)Externals\luabind;$(SolutionDir)Externals\GameSpy\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
45+
<AdditionalIncludeDirectories>$(SolutionDir);$(xrExternals);$(ProjectDir);$(xrSdkDir)include;$(DXSDK_DIR)Include;$(xrExternals)luajit\src;$(xrExternals)luabind;$(xrExternals)GameSpy\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
4546
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
4647
<!--
4748
4251 : class 'x' needs to have dll-interface to be used by clients of class 'y'

‎src/Common/object_type_traits.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
// Author : Dmitriy Iassenev
66
// Description : Object type traits
77
////////////////////////////////////////////////////////////////////////////
8+
#pragma once
89
#ifndef object_type_traits_h_included
910
#define object_type_traits_h_included
10-
#pragma once
1111

1212
#include <type_traits>
1313

‎src/Include/xrRender/DrawUtils.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,17 @@
22
// file: DrawUtils.h
33
//----------------------------------------------------
44

5+
#pragma once
56
#ifndef DrawUtilsH
67
#define DrawUtilsH
8+
#include "xrCore/_types.h"
9+
#include "xrCore/_vector3d.h"
10+
11+
#ifndef ECORE_API
12+
#pragma message("ECORE_API not defined. Invoking ugly hack to enable compilation.")
13+
#define ECORE_API
14+
#endif
15+
716
//----------------------------------------------------
817
// Utilities
918
//----------------------------------------------------

‎src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<ClCompile>
7373
<Optimization>Disabled</Optimization>
7474
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
75-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(SolutionDir)Externals\AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
75+
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7676
<PreprocessorDefinitions>_USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7777
<MinimalRebuild>true</MinimalRebuild>
7878
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -87,15 +87,15 @@
8787
<Link>
8888
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
8989
<SuppressStartupBanner>true</SuppressStartupBanner>
90-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);$(SolutionDir)Externals\AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
90+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9191
<SubSystem>Windows</SubSystem>
9292
<RandomizedBaseAddress>false</RandomizedBaseAddress>
9393
<TargetMachine>MachineX86</TargetMachine>
9494
<LargeAddressAware>true</LargeAddressAware>
9595
</Link>
9696
<PostBuildEvent>
9797
<Message>Copy AGS dll to output directory</Message>
98-
<Command>copy /Y "$(SolutionDir)Externals\AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
98+
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
9999
</PostBuildEvent>
100100
</ItemDefinitionGroup>
101101
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -107,7 +107,7 @@
107107
<OmitFramePointers>true</OmitFramePointers>
108108
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
109109
<WholeProgramOptimization>true</WholeProgramOptimization>
110-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(SolutionDir)Externals\AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
110+
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
111111
<PreprocessorDefinitions>_USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112112
<StringPooling>true</StringPooling>
113113
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -122,7 +122,7 @@
122122
</ClCompile>
123123
<Link>
124124
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
125-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);$(SolutionDir)Externals\AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
125+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
126126
<SubSystem>Windows</SubSystem>
127127
<OptimizeReferences>true</OptimizeReferences>
128128
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -133,7 +133,7 @@
133133
</Link>
134134
<PostBuildEvent>
135135
<Message>Copy AGS dll to output directory</Message>
136-
<Command>copy /Y "$(SolutionDir)Externals\AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
136+
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
137137
</PostBuildEvent>
138138
</ItemDefinitionGroup>
139139
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
@@ -144,7 +144,7 @@
144144
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
145145
<OmitFramePointers>false</OmitFramePointers>
146146
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
147-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(SolutionDir)Externals\AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
147+
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
148148
<PreprocessorDefinitions>_USRDLL;XRRENDER_R1_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149149
<StringPooling>true</StringPooling>
150150
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -158,7 +158,7 @@
158158
</ClCompile>
159159
<Link>
160160
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
161-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);$(SolutionDir)Externals\AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
161+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
162162
<SubSystem>Windows</SubSystem>
163163
<LargeAddressAware>true</LargeAddressAware>
164164
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -167,7 +167,7 @@
167167
</Link>
168168
<PostBuildEvent>
169169
<Message>Copy AGS dll to output directory</Message>
170-
<Command>copy /Y "$(SolutionDir)Externals\AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
170+
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
171171
</PostBuildEvent>
172172
</ItemDefinitionGroup>
173173
<ItemGroup>

‎src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<ClCompile>
7373
<Optimization>Disabled</Optimization>
7474
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
75-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(SolutionDir)Externals\AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
75+
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7676
<PreprocessorDefinitions>_USRDLL;XRRENDER_R2_EXPORTS;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7777
<MinimalRebuild>true</MinimalRebuild>
7878
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -87,15 +87,15 @@
8787
<Link>
8888
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
8989
<SuppressStartupBanner>true</SuppressStartupBanner>
90-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);$(SolutionDir)Externals\AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
90+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9191
<SubSystem>Windows</SubSystem>
9292
<RandomizedBaseAddress>false</RandomizedBaseAddress>
9393
<TargetMachine>MachineX86</TargetMachine>
9494
<LargeAddressAware>true</LargeAddressAware>
9595
</Link>
9696
<PostBuildEvent>
9797
<Message>Copy AGS dll to output directory</Message>
98-
<Command>copy /Y "$(SolutionDir)Externals\AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
98+
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
9999
</PostBuildEvent>
100100
</ItemDefinitionGroup>
101101
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -107,7 +107,7 @@
107107
<OmitFramePointers>true</OmitFramePointers>
108108
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
109109
<WholeProgramOptimization>true</WholeProgramOptimization>
110-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(SolutionDir)Externals\AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
110+
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
111111
<PreprocessorDefinitions>_USRDLL;XRRENDER_R2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
112112
<StringPooling>true</StringPooling>
113113
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -122,7 +122,7 @@
122122
</ClCompile>
123123
<Link>
124124
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
125-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);$(SolutionDir)Externals\AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
125+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
126126
<SubSystem>Windows</SubSystem>
127127
<OptimizeReferences>true</OptimizeReferences>
128128
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -133,7 +133,7 @@
133133
</Link>
134134
<PostBuildEvent>
135135
<Message>Copy AGS dll to output directory</Message>
136-
<Command>copy /Y "$(SolutionDir)Externals\AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
136+
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
137137
</PostBuildEvent>
138138
</ItemDefinitionGroup>
139139
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
@@ -144,7 +144,7 @@
144144
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
145145
<OmitFramePointers>false</OmitFramePointers>
146146
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
147-
<AdditionalIncludeDirectories>$(SolutionDir)Externals\OpenAutomate\inc;$(SolutionDir)Externals\nvapi;$(SolutionDir)Externals\AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
147+
<AdditionalIncludeDirectories>$(xrExternals)OpenAutomate\inc;$(xrExternals)nvapi;$(xrExternals)AGS_SDK;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
148148
<PreprocessorDefinitions>_USRDLL;XRRENDER_R2_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149149
<StringPooling>true</StringPooling>
150150
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -159,7 +159,7 @@
159159
</ClCompile>
160160
<Link>
161161
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
162-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(SolutionDir)Externals\nvapi\x86;$(SolutionDir)Externals\luajit\bin\$(PlatformShortName);$(SolutionDir)Externals\AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
162+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
163163
<SubSystem>Windows</SubSystem>
164164
<LargeAddressAware>true</LargeAddressAware>
165165
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -168,7 +168,7 @@
168168
</Link>
169169
<PostBuildEvent>
170170
<Message>Copy AGS dll to output directory</Message>
171-
<Command>copy /Y "$(SolutionDir)Externals\AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
171+
<Command>copy /Y "$(xrExternals)AGS_SDK\ags_lib\lib\amd_ags_$(PlatformShortName).dll" "$(OutDir)amd_ags_$(PlatformShortName).dll"</Command>
172172
</PostBuildEvent>
173173
</ItemDefinitionGroup>
174174
<ItemGroup>

0 commit comments

Comments
 (0)