Skip to content

Commit 279a29d

Browse files
Xottab-DUTYXottab-DUTY
committed
Fix renderers build on x64
1 parent 8719cec commit 279a29d

File tree

9 files changed

+55
-57
lines changed

9 files changed

+55
-57
lines changed

‎src/Layers/xrRender/HW.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define AFX_HW_H__0E25CF4A_FFEC_11D3_B4E3_4854E82A090D__INCLUDED_
77
#pragma once
88

9-
#include "hwcaps.h"
9+
#include "HWCaps.h"
1010

1111
#ifndef _MAYA_EXPORT
1212
#include "stats_manager.h"

‎src/Layers/xrRenderPC_R1/stdafx.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
#pragma warning(4 : 4018)
1616
#pragma warning(4 : 4244)
1717

18-
#pragma comment(lib, "d3d9.lib")
19-
2018
#include "Layers/xrRender/xrD3DDefs.h"
2119
#include "Layers/xrRender/HW.h"
2220
#include "Layers/xrRender/Shader.h"

‎src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@
138138
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
139139
</ClCompile>
140140
<Link>
141-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
141+
<AdditionalDependencies>LuaJIT.lib;nvapi.lib;oalib.lib;amd_ags_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
142142
<SuppressStartupBanner>true</SuppressStartupBanner>
143-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
143+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
144144
<SubSystem>Windows</SubSystem>
145145
<RandomizedBaseAddress>false</RandomizedBaseAddress>
146146
<TargetMachine>MachineX86</TargetMachine>
@@ -167,9 +167,9 @@
167167
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
168168
</ClCompile>
169169
<Link>
170-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
170+
<AdditionalDependencies>LuaJIT.lib;nvapi.lib;oalib.lib;amd_ags_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
171171
<SuppressStartupBanner>true</SuppressStartupBanner>
172-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
172+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
173173
<SubSystem>Windows</SubSystem>
174174
<RandomizedBaseAddress>false</RandomizedBaseAddress>
175175
<LargeAddressAware>true</LargeAddressAware>
@@ -202,8 +202,8 @@
202202
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
203203
</ClCompile>
204204
<Link>
205-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
206-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
205+
<AdditionalDependencies>LuaJIT.lib;nvapi.lib;oalib.lib;amd_ags_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
206+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
207207
<SubSystem>Windows</SubSystem>
208208
<OptimizeReferences>true</OptimizeReferences>
209209
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -240,8 +240,8 @@
240240
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
241241
</ClCompile>
242242
<Link>
243-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
244-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
243+
<AdditionalDependencies>LuaJIT.lib;nvapi.lib;oalib.lib;amd_ags_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
244+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
245245
<SubSystem>Windows</SubSystem>
246246
<OptimizeReferences>true</OptimizeReferences>
247247
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -275,8 +275,8 @@
275275
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
276276
</ClCompile>
277277
<Link>
278-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
279-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
278+
<AdditionalDependencies>LuaJIT.lib;nvapi.lib;oalib.lib;amd_ags_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
279+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
280280
<SubSystem>Windows</SubSystem>
281281
<LargeAddressAware>true</LargeAddressAware>
282282
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -309,8 +309,8 @@
309309
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
310310
</ClCompile>
311311
<Link>
312-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
313-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
312+
<AdditionalDependencies>LuaJIT.lib;nvapi.lib;oalib.lib;amd_ags_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
313+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
314314
<SubSystem>Windows</SubSystem>
315315
<LargeAddressAware>true</LargeAddressAware>
316316
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -621,6 +621,12 @@
621621
<Project>{1daec516-e52c-4a3c-a4da-ae3553e6e0f8}</Project>
622622
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
623623
</ProjectReference>
624+
<ProjectReference Include="..\..\..\Externals\luabind\src\luabind.vcxproj">
625+
<Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
626+
</ProjectReference>
627+
<ProjectReference Include="..\..\..\Externals\luajit\src\luajit.vcxproj">
628+
<Project>{632aeeb6-dc06-4e15-9551-b2b09a4b73c5}</Project>
629+
</ProjectReference>
624630
<ProjectReference Include="..\..\utils\xrMiscMath\xrMiscMath.vcxproj">
625631
<Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
626632
</ProjectReference>

‎src/Layers/xrRenderPC_R2/stdafx.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#pragma warning(4 : 4244)
2121
#pragma warning(disable : 4237)
2222

23-
#pragma comment(lib, "d3d9.lib")
24-
2523
#include "Layers/xrRender/xrD3DDefs.h"
2624
#include "Layers/xrRender/HW.h"
2725
#include "Layers/xrRender/Shader.h"

‎src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@
138138
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
139139
</ClCompile>
140140
<Link>
141-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
141+
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;oalib.lib;amd_ags_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
142142
<SuppressStartupBanner>true</SuppressStartupBanner>
143-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
143+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
144144
<SubSystem>Windows</SubSystem>
145145
<RandomizedBaseAddress>false</RandomizedBaseAddress>
146146
<TargetMachine>MachineX86</TargetMachine>
@@ -167,9 +167,9 @@
167167
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
168168
</ClCompile>
169169
<Link>
170-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
170+
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;oalib.lib;amd_ags_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
171171
<SuppressStartupBanner>true</SuppressStartupBanner>
172-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
172+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
173173
<SubSystem>Windows</SubSystem>
174174
<RandomizedBaseAddress>false</RandomizedBaseAddress>
175175
<LargeAddressAware>true</LargeAddressAware>
@@ -202,8 +202,8 @@
202202
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
203203
</ClCompile>
204204
<Link>
205-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
206-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
205+
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;oalib.lib;amd_ags_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
206+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
207207
<SubSystem>Windows</SubSystem>
208208
<OptimizeReferences>true</OptimizeReferences>
209209
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -240,8 +240,8 @@
240240
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
241241
</ClCompile>
242242
<Link>
243-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
244-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
243+
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;oalib.lib;amd_ags_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
244+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
245245
<SubSystem>Windows</SubSystem>
246246
<OptimizeReferences>true</OptimizeReferences>
247247
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -276,8 +276,8 @@
276276
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
277277
</ClCompile>
278278
<Link>
279-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
280-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
279+
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;oalib.lib;amd_ags_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
280+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
281281
<SubSystem>Windows</SubSystem>
282282
<LargeAddressAware>true</LargeAddressAware>
283283
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -311,8 +311,8 @@
311311
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
312312
</ClCompile>
313313
<Link>
314-
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;amd_ags_x86.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
315-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\x86;$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
314+
<AdditionalDependencies>LuaJIT.lib;luabind.lib;nvapi.lib;oalib.lib;amd_ags_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
315+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrExternals)OpenAutomate\libraries;$(xrExternals)nvapi\$(PlatformShortName);$(xrExternals)luajit\bin\$(PlatformShortName);$(xrExternals)AGS_SDK\ags_lib\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
316316
<SubSystem>Windows</SubSystem>
317317
<LargeAddressAware>true</LargeAddressAware>
318318
<RandomizedBaseAddress>false</RandomizedBaseAddress>

‎src/Layers/xrRenderPC_R3/stdafx.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#pragma warning(4 : 4244)
2121
#pragma warning(disable : 4237)
2222

23-
#pragma comment(lib, "d3d9.lib")
24-
2523
#include <d3d10_1.h>
2624
#include <d3d11.h>
2725
#include <D3Dx10core.h>

0 commit comments

Comments
 (0)