diff --git a/src/hardware/r_opengl/r_opengl.h b/src/hardware/r_opengl/r_opengl.h index 7ffefbb5881405bcf5a541c0f3218164a91cd581..d52104370b49d1ee72e059487532d0fe6a2f8020 100644 --- a/src/hardware/r_opengl/r_opengl.h +++ b/src/hardware/r_opengl/r_opengl.h @@ -86,7 +86,7 @@ boolean SetupGLfunc(void); boolean SetupGLFunc13(void); void Flush(void); INT32 isExtAvailable(const char *extension, const GLubyte *start); -boolean SetupPixelFormat(INT32 WantColorBits, INT32 WantStencilBits, INT32 WantDepthBits); +int SetupPixelFormat(INT32 WantColorBits, INT32 WantStencilBits, INT32 WantDepthBits); void SetModelView(GLint w, GLint h); void SetStates(void); FUNCMATH float byteasfloat(UINT8 fbyte); diff --git a/src/hardware/s_openal/s_openal-vc10.vcxproj b/src/hardware/s_openal/s_openal-vc10.vcxproj index 051de1bd66f4fd0a9468ec04afd2eb2268306e53..1b7d34c4bdc2ae11e232f60e8337040ed4d46f2b 100644 --- a/src/hardware/s_openal/s_openal-vc10.vcxproj +++ b/src/hardware/s_openal/s_openal-vc10.vcxproj @@ -186,7 +186,7 @@ </HeaderFileName> </Midl> <ClCompile> - <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> + <AdditionalOptions>/MP /SAFESEH:OFF %(AdditionalOptions)</AdditionalOptions> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WIN32__;__MSC__;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <MinimalRebuild>true</MinimalRebuild> @@ -244,6 +244,7 @@ <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>CompileAsC</CompileAs> + <AdditionalOptions>/MP /SAFESEH:OFF %(AdditionalOptions)</AdditionalOptions> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> diff --git a/src/sdl/Srb2SDL-vc10.vcxproj b/src/sdl/Srb2SDL-vc10.vcxproj index 07c10f4cf8d8cfa919cd09f7030fd090d36a728c..58dba7f28d48dbc848e117e61b92546fd5154a6f 100644 --- a/src/sdl/Srb2SDL-vc10.vcxproj +++ b/src/sdl/Srb2SDL-vc10.vcxproj @@ -133,6 +133,7 @@ <DataExecutionPrevention> </DataExecutionPrevention> <TargetMachine>MachineX86</TargetMachine> + <AdditionalOptions>/SAFESEH:NO %(AdditionalOptions)</AdditionalOptions> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> @@ -182,6 +183,7 @@ <DataExecutionPrevention> </DataExecutionPrevention> <TargetMachine>MachineX64</TargetMachine> + <AdditionalOptions>/SAFESEH:NO %(AdditionalOptions)</AdditionalOptions> </Link> <Bscmake> <SuppressStartupBanner>true</SuppressStartupBanner> diff --git a/src/win32/Srb2win-vc10.vcxproj b/src/win32/Srb2win-vc10.vcxproj index a7c938ae998b14108d5d62549ea0b6c27f83d8a0..6d05735e5f3d40142f603d4f2e77a79648289d2e 100644 --- a/src/win32/Srb2win-vc10.vcxproj +++ b/src/win32/Srb2win-vc10.vcxproj @@ -117,11 +117,12 @@ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> <ProgramDataBaseFileName>$(IntDir)Srb2win.pdb</ProgramDataBaseFileName> <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> + <WarningLevel>Level2</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <CompileAs>CompileAsC</CompileAs> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -173,11 +174,12 @@ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> <ProgramDataBaseFileName>$(IntDir)Srb2win.pdb</ProgramDataBaseFileName> <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level4</WarningLevel> + <WarningLevel>Level2</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>CompileAsC</CompileAs> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -228,11 +230,12 @@ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> <ProgramDataBaseFileName>$(IntDir)Srb2win.pdb</ProgramDataBaseFileName> <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level2</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>CompileAsC</CompileAs> <MultiProcessorCompilation>true</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -283,11 +286,12 @@ <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> <ProgramDataBaseFileName>$(IntDir)Srb2win.pdb</ProgramDataBaseFileName> <BrowseInformation>true</BrowseInformation> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level2</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <CompileAs>CompileAsC</CompileAs> <MultiProcessorCompilation>true</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> diff --git a/src/win32/win_main.h b/src/win32/win_main.h index 2c464f2c6a67f7a3366ee6c3d6ed413ebfd18ba3..05852f8340740c2aa313437af54a7d0233982056 100644 --- a/src/win32/win_main.h +++ b/src/win32/win_main.h @@ -23,7 +23,7 @@ extern HWND hWndMain; -extern int appActive; +extern boolean appActive; VOID I_GetSysMouseEvents(INT mouse_state); extern UINT MSHWheelMessage;