Skip to content

Commit cc41976

Browse files
Xottab-DUTYXottab-DUTY
committed
Fix utils compilation
ETools no longer depends on ColorPicker.lib xrSE_Factory is still broken
1 parent 279a29d commit cc41976

File tree

13 files changed

+114
-124
lines changed

13 files changed

+114
-124
lines changed

‎sdk/include/hxgrid/Interface/VECOM.h

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef VECOM_INCLUDED
22
#define VECOM_INCLUDED
33

4+
#include <atomic>
5+
46
#include "hxplatform.h"
57
#include "Singleton.h"
68

@@ -54,44 +56,28 @@ namespace VECOM
5456
class TRefCountHolder
5557
{
5658
public:
57-
volatile ULONG RefCount;
59+
std::atomic<ULONG> RefCount;
5860

5961
TRefCountHolder()
6062
{
61-
RefCount=1;
63+
RefCount.store(1, std::memory_order_release);
6264
}
6365
};
6466

6567
} //namespace
66-
67-
#ifndef _XBOX
6868

6969
//for instantiated classes - tracks refcount
7070
#define IUNKNOWN_METHODS_IMPLEMENTATION_INSTANCE() \
7171
VECOM::TRefCountHolder RefCountHolder; \
7272
virtual HRESULT __stdcall QueryInterface(REFIID riid, void** ppv) {*ppv=NULL; return E_NOINTERFACE;}; \
73-
virtual ULONG __stdcall AddRef() {volatile ULONG* p = &RefCountHolder.RefCount; __asm {mov eax,p}; __asm{LOCK INC DWORD PTR [EAX]}; return RefCountHolder.RefCount;}; \
74-
virtual ULONG __stdcall Release() {volatile ULONG* p = &RefCountHolder.RefCount; __asm {mov eax,p}; __asm{LOCK DEC DWORD PTR [EAX]}; ULONG r = RefCountHolder.RefCount; if (r==0) delete this; return r;};
75-
76-
#define IUNKNOWN_METHODS_IMPLEMENTATION_INSTANCE_EXCLUDEQUERYINTERFACE() \
77-
VECOM::TRefCountHolder RefCountHolder; \
78-
virtual ULONG __stdcall AddRef() {volatile ULONG* p = &RefCountHolder.RefCount; __asm {mov eax,p}; __asm{LOCK INC DWORD PTR [EAX]}; return RefCountHolder.RefCount;}; \
79-
virtual ULONG __stdcall Release() {volatile ULONG* p = &RefCountHolder.RefCount; __asm {mov eax,p}; __asm{LOCK DEC DWORD PTR [EAX]}; ULONG r = RefCountHolder.RefCount; if (r==0) delete this; return r;};
80-
81-
#else
82-
83-
#define IUNKNOWN_METHODS_IMPLEMENTATION_INSTANCE() \
84-
VECOM::TRefCountHolder RefCountHolder; \
85-
virtual HRESULT __stdcall QueryInterface(REFIID riid, void** ppv) {*ppv=NULL; return E_NOINTERFACE;}; \
86-
virtual ULONG __stdcall AddRef() {RefCountHolder.RefCount++; return RefCountHolder.RefCount;}; \
87-
virtual ULONG __stdcall Release() {RefCountHolder.RefCount--; ULONG r = RefCountHolder.RefCount; if (r==0) delete this; return r;};
73+
virtual ULONG __stdcall AddRef() { return RefCountHolder.RefCount.fetch_add(1, std::memory_order_acq_rel); }; \
74+
virtual ULONG __stdcall Release() { ULONG r = RefCountHolder.RefCount.fetch_sub(1, std::memory_order_acq_rel); if (r==0) delete this; return r;};
8875

8976
#define IUNKNOWN_METHODS_IMPLEMENTATION_INSTANCE_EXCLUDEQUERYINTERFACE() \
9077
VECOM::TRefCountHolder RefCountHolder; \
91-
virtual ULONG __stdcall AddRef() {RefCountHolder.RefCount++; return RefCountHolder.RefCount;}; \
92-
virtual ULONG __stdcall Release() {RefCountHolder.RefCount--; ULONG r = RefCountHolder.RefCount; if (r==0) delete this; return r;};
78+
virtual ULONG __stdcall AddRef() { return RefCountHolder.RefCount.fetch_add(1, std::memory_order_acq_rel); }; \
79+
virtual ULONG __stdcall Release() { ULONG r = RefCountHolder.RefCount.fetch_sub(1, std::memory_order_acq_rel); if (r==0) delete this; return r; };
9380

94-
#endif
9581

9682
//factory method for creating interfaces
9783
typedef IUnknown* (__cdecl *PInterfaceFactoryMethod)(TINTERFACEID InterfaceId, DWORD version, const void* ExData);
@@ -135,4 +121,3 @@ class TInterfaceObject : public InterfaceClass
135121
};
136122

137123
#endif VECOM_INCLUDED
138-

‎src/utils/ETools/CreateDX.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
#include "xrCore/Debug/dxerr.h"
66

77
// misc
8+
// Xottab_DUTY: it seems this is not used..
9+
/*
810
__declspec(dllimport) bool WINAPI
9-
FSColorPickerDoModal(unsigned int* currentColor, unsigned int* originalColor, const int initialExpansionState);
11+
FSColorPickerDoModal(unsigned int* currentColor, unsigned int* originalColor, const int initialExpansionState);
1012
extern "C" __declspec(dllexport) bool __stdcall FSColorPickerExecute(
1113
unsigned int* currentColor, unsigned int* originalColor, const int initialExpansionState)
1214
{
1315
return FSColorPickerDoModal(currentColor, originalColor, initialExpansionState);
1416
}
15-
17+
*/
1618
extern "C" {
1719
ETOOLS_API UINT WINAPI D3DX_GetDriverLevel(LPDIRECT3DDEVICE9 pDevice) { return D3DXGetDriverLevel(pDevice); }
1820
ETOOLS_API HRESULT WINAPI D3DX_GetImageInfoFromFileInMemory(

‎src/utils/ETools/ETools.vcxproj

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,14 @@
154154
<Culture>0x0422</Culture>
155155
</ResourceCompile>
156156
<Link>
157-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
158157
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
159-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
158+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
160159
<IgnoreSpecificDefaultLibraries>user32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
161160
<LargeAddressAware>true</LargeAddressAware>
162161
<OptimizeReferences>true</OptimizeReferences>
163162
<EnableCOMDATFolding>true</EnableCOMDATFolding>
164163
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
165164
<RandomizedBaseAddress>false</RandomizedBaseAddress>
166-
<TargetMachine>MachineX86</TargetMachine>
167165
</Link>
168166
</ItemDefinitionGroup>
169167
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -200,9 +198,8 @@
200198
<Culture>0x0422</Culture>
201199
</ResourceCompile>
202200
<Link>
203-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
204201
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
205-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
202+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
206203
<IgnoreSpecificDefaultLibraries>user32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
207204
<LargeAddressAware>true</LargeAddressAware>
208205
<OptimizeReferences>true</OptimizeReferences>
@@ -239,14 +236,12 @@
239236
<Culture>0x0422</Culture>
240237
</ResourceCompile>
241238
<Link>
242-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
243239
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
244-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
240+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
245241
<IgnoreSpecificDefaultLibraries>user32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
246242
<SubSystem>Windows</SubSystem>
247243
<LargeAddressAware>true</LargeAddressAware>
248244
<RandomizedBaseAddress>false</RandomizedBaseAddress>
249-
<TargetMachine>MachineX86</TargetMachine>
250245
</Link>
251246
</ItemDefinitionGroup>
252247
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -276,9 +271,8 @@
276271
<Culture>0x0422</Culture>
277272
</ResourceCompile>
278273
<Link>
279-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
280274
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
281-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
275+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
282276
<IgnoreSpecificDefaultLibraries>user32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
283277
<SubSystem>Windows</SubSystem>
284278
<LargeAddressAware>true</LargeAddressAware>
@@ -317,9 +311,9 @@
317311
<Culture>0x0422</Culture>
318312
</ResourceCompile>
319313
<Link>
320-
<AdditionalOptions>/MACHINE:I386 /NODEFAULTLIB:user32 %(AdditionalOptions)</AdditionalOptions>
314+
<AdditionalOptions>/NODEFAULTLIB:user32 %(AdditionalOptions)</AdditionalOptions>
321315
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
322-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
316+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
323317
<IgnoreSpecificDefaultLibraries>user32.dll;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
324318
<GenerateDebugInformation>true</GenerateDebugInformation>
325319
<SubSystem>Windows</SubSystem>
@@ -360,9 +354,9 @@
360354
<Culture>0x0422</Culture>
361355
</ResourceCompile>
362356
<Link>
363-
<AdditionalOptions>/MACHINE:I386 /NODEFAULTLIB:user32 %(AdditionalOptions)</AdditionalOptions>
357+
<AdditionalOptions>/NODEFAULTLIB:user32 %(AdditionalOptions)</AdditionalOptions>
364358
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
365-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
359+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
366360
<IgnoreSpecificDefaultLibraries>user32.dll;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
367361
<GenerateDebugInformation>true</GenerateDebugInformation>
368362
<SubSystem>Windows</SubSystem>

‎src/utils/LWO/LWO.vcxproj

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,10 @@
147147
<Culture>0x0419</Culture>
148148
</ResourceCompile>
149149
<Link>
150-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
151150
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
152151
<SuppressStartupBanner>true</SuppressStartupBanner>
153152
<RandomizedBaseAddress>false</RandomizedBaseAddress>
154153
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
155-
<TargetMachine>MachineX86</TargetMachine>
156154
</Link>
157155
</ItemDefinitionGroup>
158156
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -180,7 +178,6 @@
180178
<Culture>0x0419</Culture>
181179
</ResourceCompile>
182180
<Link>
183-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
184181
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
185182
<SuppressStartupBanner>true</SuppressStartupBanner>
186183
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -213,12 +210,10 @@
213210
<Culture>0x0419</Culture>
214211
</ResourceCompile>
215212
<Link>
216-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
217213
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
218214
<SuppressStartupBanner>true</SuppressStartupBanner>
219215
<RandomizedBaseAddress>false</RandomizedBaseAddress>
220216
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
221-
<TargetMachine>MachineX86</TargetMachine>
222217
</Link>
223218
</ItemDefinitionGroup>
224219
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
@@ -246,7 +241,6 @@
246241
<Culture>0x0419</Culture>
247242
</ResourceCompile>
248243
<Link>
249-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
250244
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
251245
<SuppressStartupBanner>true</SuppressStartupBanner>
252246
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -277,13 +271,11 @@
277271
<Culture>0x0419</Culture>
278272
</ResourceCompile>
279273
<Link>
280-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
281274
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
282275
<SuppressStartupBanner>true</SuppressStartupBanner>
283276
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
284277
<RandomizedBaseAddress>false</RandomizedBaseAddress>
285278
<ImportLibrary>$(xrLibDir)$(TargetName).lib</ImportLibrary>
286-
<TargetMachine>MachineX86</TargetMachine>
287279
</Link>
288280
</ItemDefinitionGroup>
289281
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -309,7 +301,6 @@
309301
<Culture>0x0419</Culture>
310302
</ResourceCompile>
311303
<Link>
312-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
313304
<AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
314305
<SuppressStartupBanner>true</SuppressStartupBanner>
315306
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

‎src/utils/xrAI/xrAI.vcxproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@
151151
<Culture>0x0409</Culture>
152152
</ResourceCompile>
153153
<Link>
154-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
155154
<SuppressStartupBanner>true</SuppressStartupBanner>
156155
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrLibDir);$(xrSdkDir)libraries;$(xrExternals)FreeImage\Dist\x32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
157156
<MapExports>false</MapExports>
@@ -192,7 +191,6 @@
192191
<Culture>0x0409</Culture>
193192
</ResourceCompile>
194193
<Link>
195-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
196194
<SuppressStartupBanner>true</SuppressStartupBanner>
197195
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrLibDir);$(xrSdkDir)libraries;$(xrExternals)FreeImage\Dist\x32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
198196
<MapExports>false</MapExports>
@@ -240,7 +238,6 @@
240238
<Culture>0x0409</Culture>
241239
</ResourceCompile>
242240
<Link>
243-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
244241
<SuppressStartupBanner>true</SuppressStartupBanner>
245242
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrLibDir);$(xrSdkDir)libraries;$(xrExternals)FreeImage\Dist\x32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
246243
<SubSystem>Windows</SubSystem>
@@ -288,7 +285,6 @@
288285
<Culture>0x0409</Culture>
289286
</ResourceCompile>
290287
<Link>
291-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
292288
<SuppressStartupBanner>true</SuppressStartupBanner>
293289
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrLibDir);$(xrSdkDir)libraries;$(xrExternals)FreeImage\Dist\x32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
294290
<SubSystem>Windows</SubSystem>
@@ -335,7 +331,6 @@
335331
<Culture>0x0409</Culture>
336332
</ResourceCompile>
337333
<Link>
338-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
339334
<SuppressStartupBanner>true</SuppressStartupBanner>
340335
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrLibDir);$(xrSdkDir)libraries;$(xrExternals)FreeImage\Dist\x32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
341336
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -381,7 +376,6 @@
381376
<Culture>0x0409</Culture>
382377
</ResourceCompile>
383378
<Link>
384-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
385379
<SuppressStartupBanner>true</SuppressStartupBanner>
386380
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrLibDir);$(xrSdkDir)libraries;$(xrExternals)FreeImage\Dist\x32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
387381
<GenerateDebugInformation>true</GenerateDebugInformation>

‎src/utils/xrCompress/lzo/lzo_init.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,13 @@ static lzo_bool basic_integral_check(void)
140140
#if defined(SIZEOF_UNSIGNED_SHORT)
141141
COMPILE_TIME_ASSERT(SIZEOF_UNSIGNED_SHORT == sizeof(unsigned short));
142142
#endif
143+
/*
143144
#if !defined(__LZO_IN_MINILZO)
144145
#if defined(SIZEOF_SIZE_T)
145146
COMPILE_TIME_ASSERT(SIZEOF_SIZE_T == sizeof(size_t));
146147
#endif
147148
#endif
149+
*/
148150

149151
/* assert the signedness of our integral types */
150152
COMPILE_TIME_ASSERT(IS_UNSIGNED(unsigned char));

‎src/utils/xrCompress/xrCompress.vcxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@
143143
<Culture>0x0409</Culture>
144144
</ResourceCompile>
145145
<Link>
146-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
147146
<SuppressStartupBanner>true</SuppressStartupBanner>
148147
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
149148
<SubSystem>Console</SubSystem>
@@ -152,7 +151,6 @@
152151
<EnableCOMDATFolding>true</EnableCOMDATFolding>
153152
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
154153
<RandomizedBaseAddress>false</RandomizedBaseAddress>
155-
<TargetMachine>MachineX86</TargetMachine>
156154
</Link>
157155
</ItemDefinitionGroup>
158156
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -185,7 +183,6 @@
185183
<Culture>0x0409</Culture>
186184
</ResourceCompile>
187185
<Link>
188-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
189186
<SuppressStartupBanner>true</SuppressStartupBanner>
190187
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
191188
<SubSystem>Console</SubSystem>
@@ -220,13 +217,11 @@
220217
<Culture>0x0409</Culture>
221218
</ResourceCompile>
222219
<Link>
223-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
224220
<SuppressStartupBanner>true</SuppressStartupBanner>
225221
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
226222
<SubSystem>Console</SubSystem>
227223
<LargeAddressAware>true</LargeAddressAware>
228224
<RandomizedBaseAddress>false</RandomizedBaseAddress>
229-
<TargetMachine>MachineX86</TargetMachine>
230225
</Link>
231226
</ItemDefinitionGroup>
232227
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -253,7 +248,6 @@
253248
<Culture>0x0409</Culture>
254249
</ResourceCompile>
255250
<Link>
256-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
257251
<SuppressStartupBanner>true</SuppressStartupBanner>
258252
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
259253
<SubSystem>Console</SubSystem>
@@ -287,7 +281,6 @@
287281
<Culture>0x0409</Culture>
288282
</ResourceCompile>
289283
<Link>
290-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
291284
<SuppressStartupBanner>true</SuppressStartupBanner>
292285
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
293286
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -323,7 +316,6 @@
323316
<Culture>0x0409</Culture>
324317
</ResourceCompile>
325318
<Link>
326-
<AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
327319
<SuppressStartupBanner>true</SuppressStartupBanner>
328320
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
329321
<GenerateDebugInformation>true</GenerateDebugInformation>

0 commit comments

Comments
 (0)