Skip to content

Commit db50007

Browse files
Xottab-DUTYXottab-DUTY
committed
Common compilation fixes
xrGame, xrAICore, xrNetServer, xrSound
1 parent b2dad67 commit db50007

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

‎src/xrAICore/Navigation/graph_abstract.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class CGraphAbstract
3434

3535
private:
3636
VERTICES m_vertices;
37-
u32 m_edge_count;
37+
size_t m_edge_count;
3838

3939
public:
4040
IC CGraphAbstract();

‎src/xrGame/configs_dumper.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,7 @@ void configs_dumper::dump_config(complete_callback_t complete_cb)
200200
return;
201201
}
202202

203-
DWORD process_affinity_mask;
204-
DWORD tmp_dword;
203+
ULONG_PTR process_affinity_mask, tmp_dword;
205204
GetProcessAffinityMask(GetCurrentProcess(), &process_affinity_mask, &tmp_dword);
206205
bool single_core = (btwCount1(static_cast<u32>(process_affinity_mask)) == 1);
207206
if (single_core)

‎src/xrGame/screenshot_manager.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@ void screenshot_manager::shedule_Update(u32 dt)
194194
}
195195
}
196196
#endif //#ifdef DEBUG*/
197-
DWORD process_affinity_mask;
198-
DWORD tmp_dword;
197+
ULONG_PTR process_affinity_mask, tmp_dword;
199198
GetProcessAffinityMask(GetCurrentProcess(), &process_affinity_mask, &tmp_dword);
200199
process_screenshot(btwCount1(static_cast<u32>(process_affinity_mask)) == 1);
201200
}

‎src/xrNetServer/xrNetServer.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<Link>
153153
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
154154
<SuppressStartupBanner>true</SuppressStartupBanner>
155-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
156156
<SubSystem>Windows</SubSystem>
157157
<OptimizeReferences>true</OptimizeReferences>
158158
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -195,7 +195,7 @@
195195
<Link>
196196
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
197197
<SuppressStartupBanner>true</SuppressStartupBanner>
198-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
198+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
199199
<SubSystem>Windows</SubSystem>
200200
<OptimizeReferences>true</OptimizeReferences>
201201
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -236,7 +236,7 @@
236236
<Link>
237237
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
238238
<SuppressStartupBanner>true</SuppressStartupBanner>
239-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
239+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
240240
<SubSystem>Windows</SubSystem>
241241
<LargeAddressAware>true</LargeAddressAware>
242242
<OptimizeReferences />
@@ -276,7 +276,7 @@
276276
<Link>
277277
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
278278
<SuppressStartupBanner>true</SuppressStartupBanner>
279-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
279+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
280280
<SubSystem>Windows</SubSystem>
281281
<LargeAddressAware>true</LargeAddressAware>
282282
<OptimizeReferences>
@@ -316,7 +316,7 @@
316316
<Link>
317317
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
318318
<SuppressStartupBanner>true</SuppressStartupBanner>
319-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
319+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
320320
<SubSystem>Windows</SubSystem>
321321
<RandomizedBaseAddress>false</RandomizedBaseAddress>
322322
<LargeAddressAware>true</LargeAddressAware>
@@ -349,7 +349,7 @@
349349
<Link>
350350
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
351351
<SuppressStartupBanner>true</SuppressStartupBanner>
352-
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
352+
<AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\$(PlatformShortName);$(xrSdkDir)libraries;$(xrLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
353353
<SubSystem>Windows</SubSystem>
354354
<RandomizedBaseAddress>false</RandomizedBaseAddress>
355355
<LargeAddressAware>true</LargeAddressAware>

‎src/xrSound/xrSound.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<AdditionalOptions>/NODEFAULTLIB:LIBCMTD %(AdditionalOptions)</AdditionalOptions>
144144
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies)</AdditionalDependencies>
145145
<SuppressStartupBanner>true</SuppressStartupBanner>
146-
<AdditionalLibraryDirectories>$(xrExternals)libvorbis\win32\lib\$(Platform)\Debug;$(xrExternals)libogg\win32\lib\$(Platform)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
146+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
147147
<MapExports>false</MapExports>
148148
<SubSystem>Windows</SubSystem>
149149
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -173,7 +173,7 @@
173173
<AdditionalOptions>/NODEFAULTLIB:LIBCMTD %(AdditionalOptions)</AdditionalOptions>
174174
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies)</AdditionalDependencies>
175175
<SuppressStartupBanner>true</SuppressStartupBanner>
176-
<AdditionalLibraryDirectories>$(xrExternals)libvorbis\win32\lib\$(Platform)\Debug;$(xrExternals)libogg\win32\lib\$(Platform)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
176+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
177177
<MapExports>false</MapExports>
178178
<SubSystem>Windows</SubSystem>
179179
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -204,7 +204,7 @@
204204
</ClCompile>
205205
<Link>
206206
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies)</AdditionalDependencies>
207-
<AdditionalLibraryDirectories>$(xrExternals)libvorbis\win32\lib\$(Platform)\Release;$(xrExternals)libogg\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
207+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
208208
<SubSystem>Windows</SubSystem>
209209
<OptimizeReferences>true</OptimizeReferences>
210210
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -238,7 +238,7 @@
238238
</ClCompile>
239239
<Link>
240240
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies)</AdditionalDependencies>
241-
<AdditionalLibraryDirectories>$(xrExternals)libvorbis\win32\lib\$(Platform)\Release;$(xrExternals)libogg\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
241+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
242242
<SubSystem>Windows</SubSystem>
243243
<OptimizeReferences>true</OptimizeReferences>
244244
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -269,7 +269,7 @@
269269
</ClCompile>
270270
<Link>
271271
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies)</AdditionalDependencies>
272-
<AdditionalLibraryDirectories>$(xrExternals)libvorbis\win32\lib\$(Platform)\Release;$(xrExternals)libogg\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
272+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
273273
<SubSystem>Windows</SubSystem>
274274
<LargeAddressAware>true</LargeAddressAware>
275275
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -299,7 +299,7 @@
299299
</ClCompile>
300300
<Link>
301301
<AdditionalDependencies>libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;OpenAL32.lib;eax.lib;dsound.lib;xrCDB.lib;%(AdditionalDependencies)</AdditionalDependencies>
302-
<AdditionalLibraryDirectories>$(xrExternals)libvorbis\win32\lib\$(Platform)\Release;$(xrExternals)libogg\win32\lib\$(Platform)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
302+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
303303
<SubSystem>Windows</SubSystem>
304304
<LargeAddressAware>true</LargeAddressAware>
305305
<RandomizedBaseAddress>false</RandomizedBaseAddress>

0 commit comments

Comments
 (0)