Skip to content
This repository has been archived by the owner on Jan 2, 2021. It is now read-only.

Commit

Permalink
Fix broken build under VS2012
Browse files Browse the repository at this point in the history
  • Loading branch information
@dghost
dghost committed Jan 25, 2015
1 parent 1afaf0f commit bc94ce5
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 15 deletions.
6 changes: 3 additions & 3 deletions backends/sdl2/sys_sdl2.c
View file
Expand Up @@ -369,7 +369,7 @@ void Sys_Quit (void)
void cpuid(uint32_t info, uint32_t *regs)
{
#ifdef _WIN32
__cpuid((int *)regs, (int)info;
__cpuid((int *)regs, (int)info);

#else
asm volatile
Expand Down Expand Up @@ -399,7 +399,7 @@ qboolean cpu_string(char* buffer, int size)

for (start = 0; start < 49 && namestring[start]==' '; start++);

snprintf(buffer, size, "%s",&namestring[start]);
SDL_snprintf(buffer, size, "%s",&namestring[start]);
return true;
}
#endif
Expand Down Expand Up @@ -446,7 +446,7 @@ void Sys_Init (void)
int cores = SDL_GetCPUCount();
char string[50];
memset(string, 0, sizeof(string));
snprintf(string, sizeof(string),"Unknown %d-core CPU", cores);
SDL_snprintf(string, sizeof(string),"Unknown %d-core CPU", cores);
Cvar_Get("sys_cpu", string, CVAR_NOSET|CVAR_LATCH);
}

Expand Down
Binary file removed backends/win32/lib/ogg_static.lib
View file
Binary file not shown.
Binary file removed backends/win32/lib/vorbisfile_static.lib
View file
Binary file not shown.
Binary file modified backends/win32/lib/zlibstat.lib
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion game_mp
Submodule game_mp updated from c7e7a6 to 2f65a4
8 changes: 5 additions & 3 deletions quake2.vcxproj
View file
Expand Up @@ -116,7 +116,7 @@
<SubSystem>Windows</SubSystem>
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
<AdditionalLibraryDirectories>external\sdl2\lib\x86\;external\Steam\redistributable_bin\;external\OculusSDK\LibOVR\Lib\Win32\VS2012\;external\glew\lib\Release\Win32\;backends\win32\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;steam_api.lib;glew32s.lib;opengl32.lib;xinput9_1_0.lib;libovrd.lib;wsock32.lib;winmm.lib;zlibstat.lib;ogg_static.lib;vorbisfile_static.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;glew32s.lib;opengl32.lib;xinput9_1_0.lib;libovrd.lib;wsock32.lib;winmm.lib;zlibstat.lib;ws2_32.lib;steam_api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>LIBCMT.LIB ;MSVCRT.LIB</IgnoreSpecificDefaultLibraries>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
Expand Down Expand Up @@ -162,7 +162,7 @@
<IgnoreSpecificDefaultLibraries>LIBCMT;LIBC;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
<AdditionalLibraryDirectories>external\sdl2\lib\x86\;external\Steam\redistributable_bin\;external\OculusSDK\LibOVR\Lib\Win32\VS2012\;external\glew\lib\Release\Win32\;backends\win32\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;steam_api.lib;glew32s.lib;opengl32.lib;xinput9_1_0.lib;libovr.lib;winmm.lib;wsock32.lib;zlibstat.lib;ogg_static.lib;vorbisfile_static.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;glew32s.lib;opengl32.lib;xinput9_1_0.lib;libovr.lib;winmm.lib;wsock32.lib;zlibstat.lib;ws2_32.lib;steam_api.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
Expand Down Expand Up @@ -206,7 +206,7 @@
<IgnoreSpecificDefaultLibraries>LIBCMT;LIBC;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<OutputFile>$(OutDir)$(TargetFileName)</OutputFile>
<AdditionalLibraryDirectories>external\sdl2\lib\x86\;external\Steam\redistributable_bin\;external\OculusSDK\LibOVR\Lib\Win32\VS2012\;external\glew\lib\Release\Win32\;backends\win32\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;glew32s.lib;opengl32.lib;xinput9_1_0.lib;libovr.lib;winmm.lib;wsock32.lib;zlibstat.lib;ogg_static.lib;vorbisfile_static.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;glew32s.lib;opengl32.lib;xinput9_1_0.lib;libovr.lib;winmm.lib;wsock32.lib;zlibstat.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
Expand Down Expand Up @@ -318,6 +318,8 @@
<ClCompile Include="qcommon\shared\m_flash.c" />
<ClCompile Include="qcommon\shared\q_shared.c" />
<ClCompile Include="qcommon\wildcard.c" />
<ClCompile Include="qcommon\zip\ioapi.c" />
<ClCompile Include="qcommon\zip\unzip.c" />
<ClCompile Include="server\sv_ccmds.c" />
<ClCompile Include="server\sv_ents.c" />
<ClCompile Include="server\sv_game.c" />
Expand Down
6 changes: 6 additions & 0 deletions quake2.vcxproj.filters
View file
Expand Up @@ -393,6 +393,12 @@
<ClCompile Include="client\renderer\r_stereo.c">
<Filter>Source Files\client\renderer</Filter>
</ClCompile>
<ClCompile Include="qcommon\zip\unzip.c">
<Filter>Source Files\common</Filter>
</ClCompile>
<ClCompile Include="qcommon\zip\ioapi.c">
<Filter>Source Files\common</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="client\anorms.h">
Expand Down
16 changes: 8 additions & 8 deletions quake2vr.sln
View file
Expand Up @@ -10,10 +10,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake2vr", "quake2.vcxproj"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "baseq2", "game\game.vcxproj", "{09E58C1F-353D-58C5-DE43-60F70BB966AE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "missionpack", "missionpacksrc\gamemp.vcxproj", "{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibOVR", "external\OculusSDK\LibOVR\Projects\Win32\VS2012\LibOVR.vcxproj", "{CCFFB3F0-DDC4-4F01-8116-A5BFC53B331C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "missionpack", "game_mp\gamemp.vcxproj", "{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand All @@ -33,18 +33,18 @@ Global
{09E58C1F-353D-58C5-DE43-60F70BB966AE}.Release - No SteamVR|Win32.Build.0 = Release|Win32
{09E58C1F-353D-58C5-DE43-60F70BB966AE}.Release|Win32.ActiveCfg = Release|Win32
{09E58C1F-353D-58C5-DE43-60F70BB966AE}.Release|Win32.Build.0 = Release|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Debug|Win32.ActiveCfg = Debug|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Debug|Win32.Build.0 = Debug|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Release - No SteamVR|Win32.ActiveCfg = Release|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Release - No SteamVR|Win32.Build.0 = Release|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Release|Win32.ActiveCfg = Release|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Release|Win32.Build.0 = Release|Win32
{CCFFB3F0-DDC4-4F01-8116-A5BFC53B331C}.Debug|Win32.ActiveCfg = Debug|Win32
{CCFFB3F0-DDC4-4F01-8116-A5BFC53B331C}.Debug|Win32.Build.0 = Debug|Win32
{CCFFB3F0-DDC4-4F01-8116-A5BFC53B331C}.Release - No SteamVR|Win32.ActiveCfg = Release|Win32
{CCFFB3F0-DDC4-4F01-8116-A5BFC53B331C}.Release - No SteamVR|Win32.Build.0 = Release|Win32
{CCFFB3F0-DDC4-4F01-8116-A5BFC53B331C}.Release|Win32.ActiveCfg = Release|Win32
{CCFFB3F0-DDC4-4F01-8116-A5BFC53B331C}.Release|Win32.Build.0 = Release|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Debug|Win32.ActiveCfg = Debug|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Debug|Win32.Build.0 = Debug|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Release - No SteamVR|Win32.ActiveCfg = Release|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Release - No SteamVR|Win32.Build.0 = Release|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Release|Win32.ActiveCfg = Release|Win32
{0DDC01CC-74EB-43BF-8BC7-1807346B74B0}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit bc94ce5

Please sign in to comment.