lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MSVC: fixed up MSVC project

This commit is contained in:
Alam Ed Arias 2016-05-21 23:53:04 -04:00
parent 9550f9626b
commit 57091261d9
41 changed files with 2726 additions and 2740 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -17,4 +17,4 @@ Win32_LIB_ASM_Release
/objs/VC10/
*.user
*.db
*.opendb
*.opendb

28
SRB2_Debug.props Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<ClCompile>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<AssemblerOutput>All</AssemblerOutput>
<SmallerTypeCheck>true</SmallerTypeCheck>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
</ClCompile>
<Link>
<GenerateDebugInformation>Debug</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

32
SRB2_Release.props Normal file
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>true</IntrinsicFunctions>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<Link>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<GenerateDebugInformation>DebugFastLink</GenerateDebugInformation>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

28
SRB2_common.props Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<CodeAnalysisRuleSet>MixedMinimumRules.ruleset</CodeAnalysisRuleSet>
<OutDir>$(SolutionDir)bin\VC10\$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(SolutionDir)objs\VC10\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<PreprocessorDefinitions>HAVE_PNG;COMPVERSION;HAVE_BLUA;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CompileAs>CompileAsC</CompileAs>
<BrowseInformation>true</BrowseInformation>
<TreatWarningAsError>true</TreatWarningAsError>
<EnablePREfast>false</EnablePREfast>
<SDLCheck>false</SDLCheck>
</ClCompile>
<Link>
<AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

25
SRB2_x86.props Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>USEASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<CustomBuild />
<CustomBuild />
<CustomBuild />
<PreBuildEvent>
<Command>
</Command>
</PreBuildEvent>
<CustomBuildStep />
<CustomBuildStep />
<CustomBuildStep />
<Link>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

13
comptime.props Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<PreBuildEvent>
<Command>"$(SolutionDir)comptime.bat" "$(ProjectDir).."</Command>
<Message>Getting revision number from the SCM system</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

11
libs/FMOD_common.props Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IncludePath>$(SolutionDir)libs\fmodex\inc;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)libs\fmodex\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup />
<ItemGroup />
</Project>

12
libs/FMOD_x64.props Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>fmodexL64_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

12
libs/FMOD_x86.props Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>fmodexL_vc.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

15
libs/SDL2_common.props Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IncludePath>$(SolutionDir)libs\SDL2\include;$(IncludePath)</IncludePath>
<LibraryPath>..\..\libs\SDL2\lib\$(PlatformTarget);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>SDL2.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

15
libs/SDL_mixer_common.props Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IncludePath>$(SolutionDir)libs\SDL2_mixer\include;$(IncludePath)</IncludePath>
<LibraryPath>..\..\libs\SDL2_mixer\lib\$(PlatformTarget);$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

9
libs/libpng-src/projects/visualc10/libpng.vcxproj
View File

@ -21,6 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{72B01ACA-7A1A-4F7B-ACEF-2607299CF052}</ProjectGuid>
<RootNamespace>libpng</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -81,7 +82,7 @@
<AdditionalIncludeDirectories>..\..;..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;PNG_USE_PNGVCRD;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<AssemblerListingLocation>$(ProjectDir)$(Platform)\$(Configuration)\</AssemblerListingLocation>
<ObjectFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ObjectFileName>
@ -116,7 +117,7 @@
<AdditionalIncludeDirectories>..\..;..\..\..\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;PNG_USE_PNGVCRD;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<AssemblerListingLocation>$(ProjectDir)$(Platform)\$(Configuration)\</AssemblerListingLocation>
<ObjectFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ObjectFileName>
@ -149,7 +150,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;PNG_USE_PNGVCRD;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>$(ProjectDir)$(Platform)\$(Configuration)\</AssemblerListingLocation>
<ObjectFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ObjectFileName>
<ProgramDataBaseFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ProgramDataBaseFileName>
@ -183,7 +184,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PNG_DEBUG=1;PNG_USE_PNGVCRD;PNG_LIBPNG_SPECIALBUILD;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>$(ProjectDir)$(Platform)\$(Configuration)\</AssemblerListingLocation>
<ObjectFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ObjectFileName>
<ProgramDataBaseFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ProgramDataBaseFileName>

3
src/win32/FMOD.props → libs/libpng_common.props
View File

@ -3,8 +3,7 @@
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IncludePath>..\..\libs\fmodex\inc;$(IncludePath)</IncludePath>
<LibraryPath>..\..\libs\fmodex\lib;$(LibraryPath)</LibraryPath>
<IncludePath>$(SolutionDir)libs\libpng-src;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup />
<ItemGroup />

9
libs/zlib/projects/visualc10/zlib.vcxproj
View File

@ -21,6 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{73A5729C-7323-41D4-AB48-8A03C9F81603}</ProjectGuid>
<RootNamespace>zlib</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@ -81,7 +82,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;ASMV;ASMINF;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>$(ProjectDir)$(Platform)\$(Configuration)\</AssemblerListingLocation>
<ObjectFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ObjectFileName>
<ProgramDataBaseFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ProgramDataBaseFileName>
@ -114,7 +115,7 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<AssemblerListingLocation>$(ProjectDir)$(Platform)\$(Configuration)\</AssemblerListingLocation>
<ObjectFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ObjectFileName>
<ProgramDataBaseFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ProgramDataBaseFileName>
@ -144,7 +145,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<PreprocessorDefinitions>WIN32;NDEBUG;ASMV;ASMINF;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<AssemblerListingLocation>$(ProjectDir)$(Platform)\$(Configuration)\</AssemblerListingLocation>
<ObjectFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ObjectFileName>
@ -177,7 +178,7 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<AssemblerListingLocation>$(ProjectDir)$(Platform)\$(Configuration)\</AssemblerListingLocation>
<ObjectFileName>$(ProjectDir)$(Platform)\$(Configuration)\</ObjectFileName>

10
libs/zlib_common.props Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IncludePath>$(SolutionDir)libs\zlib;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup />
<ItemGroup />
</Project>

2
src/hardware/hw_main.c
View File

@ -2292,7 +2292,7 @@ static void HWR_StoreWallRange(double startfrac, double endfrac)
else if (drawtextured)
{
#ifdef ESLOPE // P.S. this is better-organized than the old version
fixed_t offs = sides[(newline ?: rover->master)->sidenum[0]].rowoffset;
fixed_t offs = sides[(newline ? newline : rover->master)->sidenum[0]].rowoffset;
grTex = HWR_GetTexture(texnum);
wallVerts[3].t = (*rover->topheight - h + offs) * grTex->scaleY;

1
src/hardware/r_opengl/r_opengl-vc10.vcxproj
View File

@ -22,6 +22,7 @@
<ProjectName>r_opengl</ProjectName>
<ProjectGuid>{51137D5C-4E81-4955-AACF-EA3092006051}</ProjectGuid>
<RootNamespace>r_opengl</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

1
src/hardware/r_opengl/r_opengl.h
View File

@ -21,6 +21,7 @@
#define _R_OPENGL_H_
#ifdef HAVE_SDL
#define _MATH_DEFINES_DEFINED
#ifdef _MSC_VER
#pragma warning(disable : 4214 4244)

1
src/hardware/s_openal/s_openal-vc10.vcxproj
View File

@ -22,6 +22,7 @@
<ProjectName>s_openal</ProjectName>
<ProjectGuid>{E662D0B3-412D-4D55-A5EC-8CBD680DDCBE}</ProjectGuid>
<RootNamespace>s_openal</RootNamespace>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

2
src/i_addrinfo.c
View File

@ -105,7 +105,7 @@ static void WS_addrinfosetup(void)
return; // already have the functions
// why not hold it into ipv6dll? becase we already link with ws2_32, silly!
if (WS_getfunctions(GetModuleHandleA("ws2_32.dll")) == NULL)
ipv6dll = WS_getfunctions(LoadLibrary("wship6.dll"));
ipv6dll = WS_getfunctions(LoadLibraryA("wship6.dll"));
}
void WS_addrinfocleanup(void)

10
src/p_mobj.c
View File

@ -891,7 +891,7 @@ fixed_t P_MobjFloorZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed_t
testy += y;
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ?: sector))
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
return P_GetZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
@ -979,7 +979,7 @@ fixed_t P_MobjCeilingZ(mobj_t *mobj, sector_t *sector, sector_t *boundsec, fixed
testy += y;
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ?: sector))
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
return P_GetZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
@ -1068,7 +1068,7 @@ fixed_t P_CameraFloorZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, fix
testy += y;
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ?: sector))
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
return P_GetZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
@ -1156,7 +1156,7 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
testy += y;
// If the highest point is in the sector, then we have it easy! Just get the Z at that point
if (R_PointInSubsector(testx, testy)->sector == (boundsec ?: sector))
if (R_PointInSubsector(testx, testy)->sector == (boundsec ? boundsec : sector))
return P_GetZAt(slope, testx, testy);
// If boundsec is set, we're looking for specials. In that case, iterate over every line in this sector to find the TRUE highest/lowest point
@ -2948,7 +2948,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
|| (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height >= mo->ceilingz)) // Hit the floor, so split!
{
// split
mobj_t *explodemo;
mobj_t *explodemo = NULL;
UINT8 prandom, i;
for (i = 0; i < 4; ++i) // split into four

2
src/p_slopes.c
View File

@ -90,7 +90,7 @@ static void P_ReconfigureVertexSlope(pslope_t *slope)
// Get angles
slope->xydirection = R_PointToAngle2(0, 0, slope->d.x, slope->d.y)+ANGLE_180;
slope->zangle = -R_PointToAngle2(0, 0, FRACUNIT, slope->zdelta);
slope->zangle = InvAngle(R_PointToAngle2(0, 0, FRACUNIT, slope->zdelta))-1;
}
}

2
src/r_bsp.c
View File

@ -1232,7 +1232,7 @@ void R_Prep3DFloors(sector_t *sector)
INT32 count, i, mapnum;
sector_t *sec;
#ifdef ESLOPE
pslope_t *bestslope;
pslope_t *bestslope = NULL;
fixed_t heighttest; // I think it's better to check the Z height at the sector's center
// than assume unsloped heights are accurate indicators of order in sloped sectors. -Red
#endif

4
src/r_plane.c
View File

@ -955,8 +955,8 @@ void R_DrawSinglePlane(visplane_t *pl)
// Okay, look, don't ask me why this works, but without this setup there's a disgusting-looking misalignment with the textures. -Red
fudge = ((1<<nflatshiftup)+1.0f)/(1<<nflatshiftup);
xoffs *= fudge;
yoffs /= fudge;
xoffs = (fixed_t)(xoffs*fudge);
yoffs = (fixed_t)(yoffs/fudge);
vx = FIXED_TO_FLOAT(pl->viewx+xoffs);
vy = FIXED_TO_FLOAT(pl->viewy-yoffs);

19
src/sdl/SDL2_x64.props
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IncludePath>..\..\libs\SDL2_mixer\include;..\..\libs\SDL2\include;$(IncludePath)</IncludePath>
<LibraryPath>..\..\libs\SDL2\lib\x64;..\..\libs\SDL2_mixer\lib\x64;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link />
<Link>
<AdditionalDependencies>SDL2.lib;SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

18
src/sdl/SDL2_x86.props
View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IncludePath>..\..\libs\SDL2_mixer\include;..\..\libs\SDL2\include;$(IncludePath)</IncludePath>
<LibraryPath>..\..\libs\SDL2\lib\x86;..\..\libs\SDL2_mixer\lib\x86;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>SDL2.lib;SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

12
src/sdl/SRB2SDL.props Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

1680
src/sdl/Srb2SDL-vc10.vcxproj
View File

File diff suppressed because it is too large Load Diff

879
src/sdl/Srb2SDL-vc10.vcxproj.filters Normal file
View File

@ -0,0 +1,879 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="A_Asm">
<UniqueIdentifier>{646b0817-0dc5-4793-92da-24f7c073eda9}</UniqueIdentifier>
</Filter>
<Filter Include="B_Bots">
<UniqueIdentifier>{623dc46a-ca67-4857-a2f0-d4357ff43cd7}</UniqueIdentifier>
</Filter>
<Filter Include="BLUA">
<UniqueIdentifier>{067072e3-d4f9-4198-8f0f-cfcbc2f6c02e}</UniqueIdentifier>
</Filter>
<Filter Include="D_Doom">
<UniqueIdentifier>{b92269bc-8016-4be6-8af4-47ad1fee89f6}</UniqueIdentifier>
</Filter>
<Filter Include="Docs">
<UniqueIdentifier>{87800b1f-d777-4c10-876c-2d92cb872dce}</UniqueIdentifier>
</Filter>
<Filter Include="F_Frame">
<UniqueIdentifier>{62561ca5-fce2-4d08-a949-a0a3d17bf339}</UniqueIdentifier>
</Filter>
<Filter Include="G_Game">
<UniqueIdentifier>{2b867933-3f95-4c63-b3a9-a00f84446cbb}</UniqueIdentifier>
</Filter>
<Filter Include="H_Hud">
<UniqueIdentifier>{32aefb9c-2644-4093-9ef5-e91d44aa1037}</UniqueIdentifier>
</Filter>
<Filter Include="Hw_Hardware">
<UniqueIdentifier>{b7a026c5-1987-42c4-bc59-4eeb4f54b7c9}</UniqueIdentifier>
</Filter>
<Filter Include="I_Interface">
<UniqueIdentifier>{bdfebd6c-f16e-47f5-9d8c-24baf1bad420}</UniqueIdentifier>
</Filter>
<Filter Include="LUA">
<UniqueIdentifier>{803cf010-5486-46c8-ade2-b01a0869210a}</UniqueIdentifier>
</Filter>
<Filter Include="M_Misc">
<UniqueIdentifier>{83376506-8a10-4a40-a039-42b2ec7bf0f4}</UniqueIdentifier>
</Filter>
<Filter Include="O_Other">
<UniqueIdentifier>{11b4cbfe-c155-4a85-9cc6-f6c88b6972e0}</UniqueIdentifier>
</Filter>
<Filter Include="P_Play">
<UniqueIdentifier>{11c84652-594a-44bf-a878-74623ec884ca}</UniqueIdentifier>
</Filter>
<Filter Include="R_Rend">
<UniqueIdentifier>{7609c825-447e-4462-be3c-75a4994227f0}</UniqueIdentifier>
</Filter>
<Filter Include="S_Sounds">
<UniqueIdentifier>{b312a1da-edaa-49d2-b206-c269173a4394}</UniqueIdentifier>
</Filter>
<Filter Include="W_Wad">
<UniqueIdentifier>{06686222-4320-4c3d-8685-2b8545d587d5}</UniqueIdentifier>
</Filter>
<Filter Include="SDLApp">
<UniqueIdentifier>{3ae8d323-3eeb-47ab-8c28-b891616db1b4}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\p5prof.h">
<Filter>A_Asm</Filter>
</ClInclude>
<ClInclude Include="..\b_bot.h">
<Filter>B_Bots</Filter>
</ClInclude>
<ClInclude Include="..\blua\lapi.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lauxlib.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lcode.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\ldebug.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\ldo.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lfunc.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lgc.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\llex.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\llimits.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lmem.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lobject.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lopcodes.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lparser.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lstate.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lstring.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\ltable.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\ltm.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lua.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\luaconf.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lualib.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lundump.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lvm.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lzio.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\dehacked.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\doomdata.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\doomdef.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\doomstat.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\doomtype.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_clisrv.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_event.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_main.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_net.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_netcmd.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_netfil.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_player.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_think.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_ticcmd.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\z_zone.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\f_finale.h">
<Filter>F_Frame</Filter>
</ClInclude>
<ClInclude Include="..\g_game.h">
<Filter>G_Game</Filter>
</ClInclude>
<ClInclude Include="..\g_input.h">
<Filter>G_Game</Filter>
</ClInclude>
<ClInclude Include="..\g_state.h">
<Filter>G_Game</Filter>
</ClInclude>
<ClInclude Include="..\am_map.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\command.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\console.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\hu_stuff.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\st_stuff.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\y_inter.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw3dsdrv.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw3sound.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hws_data.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_data.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_defs.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_dll.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_drv.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_glide.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_glob.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_light.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_main.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_md2.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\byteptr.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\endian.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\filesrch.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_addrinfo.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_joy.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_net.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_sound.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_system.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_tcp.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_video.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\keys.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\mserv.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\lua_hook.h">
<Filter>LUA</Filter>
</ClInclude>
<ClInclude Include="..\lua_hud.h">
<Filter>LUA</Filter>
</ClInclude>
<ClInclude Include="..\lua_libs.h">
<Filter>LUA</Filter>
</ClInclude>
<ClInclude Include="..\lua_script.h">
<Filter>LUA</Filter>
</ClInclude>
<ClInclude Include="..\md5.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_anigif.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_argv.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_bbox.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_cheat.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_cond.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_dllist.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_fixed.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_menu.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_misc.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_queue.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_random.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_swap.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\comptime.h">
<Filter>O_Other</Filter>
</ClInclude>
<ClInclude Include="..\fastcmp.h">
<Filter>O_Other</Filter>
</ClInclude>
<ClInclude Include="..\info.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_local.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_maputl.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_mobj.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_polyobj.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_pspr.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_saveg.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_setup.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_slopes.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_spec.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_tick.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\tables.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\r_bsp.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_data.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_defs.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_draw.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_local.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_main.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_plane.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_segs.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_sky.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_splats.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_state.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_things.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\screen.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\v_video.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\sounds.h">
<Filter>S_Sounds</Filter>
</ClInclude>
<ClInclude Include="..\s_sound.h">
<Filter>S_Sounds</Filter>
</ClInclude>
<ClInclude Include="..\lzf.h">
<Filter>W_Wad</Filter>
</ClInclude>
<ClInclude Include="..\w_wad.h">
<Filter>W_Wad</Filter>
</ClInclude>
<ClInclude Include="endtxt.h">
<Filter>SDLApp</Filter>
</ClInclude>
<ClInclude Include="hwsym_sdl.h">
<Filter>SDLApp</Filter>
</ClInclude>
<ClInclude Include="i_ttf.h">
<Filter>SDLApp</Filter>
</ClInclude>
<ClInclude Include="ogl_sdl.h">
<Filter>SDLApp</Filter>
</ClInclude>
<ClInclude Include="sdlmain.h">
<Filter>SDLApp</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\tmap.nas">
<Filter>A_Asm</Filter>
</CustomBuild>
<CustomBuild Include="..\tmap_mmx.nas">
<Filter>A_Asm</Filter>
</CustomBuild>
<CustomBuild Include="..\tmap_vc.nas">
<Filter>A_Asm</Filter>
</CustomBuild>
</ItemGroup>
<ItemGroup>
<None Include="..\asm_defs.inc">
<Filter>A_Asm</Filter>
</None>
<None Include="..\config.h.in">
<Filter>O_Other</Filter>
</None>
<None Include="SDL_icon.xpm">
<Filter>SDLApp</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\b_bot.c">
<Filter>B_Bots</Filter>
</ClCompile>
<ClCompile Include="..\blua\lapi.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lauxlib.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lbaselib.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lcode.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ldebug.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ldo.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ldump.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lfunc.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lgc.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\linit.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\llex.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lmem.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lobject.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lopcodes.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lparser.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lstate.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lstring.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lstrlib.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ltable.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ltablib.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ltm.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lundump.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lvm.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lzio.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\dehacked.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\d_clisrv.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\d_main.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\d_net.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\d_netcmd.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\d_netfil.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\z_zone.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\f_finale.c">
<Filter>F_Frame</Filter>
</ClCompile>
<ClCompile Include="..\f_wipe.c">
<Filter>F_Frame</Filter>
</ClCompile>
<ClCompile Include="..\g_game.c">
<Filter>G_Game</Filter>
</ClCompile>
<ClCompile Include="..\g_input.c">
<Filter>G_Game</Filter>
</ClCompile>
<ClCompile Include="..\am_map.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\command.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\console.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\hu_stuff.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\st_stuff.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\y_inter.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw3sound.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_bsp.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_cache.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_draw.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_light.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_main.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_md2.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_trick.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\filesrch.c">
<Filter>I_Interface</Filter>
</ClCompile>
<ClCompile Include="..\i_addrinfo.c">
<Filter>I_Interface</Filter>
</ClCompile>
<ClCompile Include="..\i_tcp.c">
<Filter>I_Interface</Filter>
</ClCompile>
<ClCompile Include="..\mserv.c">
<Filter>I_Interface</Filter>
</ClCompile>
<ClCompile Include="..\lua_baselib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_consolelib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_hooklib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_hudlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_infolib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_maplib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_mathlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_mobjlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_playerlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_script.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_skinlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_thinkerlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\md5.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_anigif.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_argv.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_bbox.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_cheat.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_cond.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_fixed.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_menu.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_misc.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_queue.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_random.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\string.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\comptime.c">
<Filter>O_Other</Filter>
</ClCompile>
<ClCompile Include="..\info.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_ceilng.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_enemy.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_floor.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_inter.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_lights.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_map.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_maputl.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_mobj.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_polyobj.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_saveg.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_setup.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_sight.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_slopes.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_spec.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_telept.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_tick.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_user.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\tables.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\t_facon.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\t_fsin.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\t_ftan.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\t_tan2a.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\r_bsp.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_data.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_draw.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_draw16.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_draw8.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_main.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_plane.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_segs.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_sky.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_splats.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_things.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\screen.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\v_video.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\sounds.c">
<Filter>S_Sounds</Filter>
</ClCompile>
<ClCompile Include="..\s_sound.c">
<Filter>S_Sounds</Filter>
</ClCompile>
<ClCompile Include="..\lzf.c">
<Filter>W_Wad</Filter>
</ClCompile>
<ClCompile Include="..\w_wad.c">
<Filter>W_Wad</Filter>
</ClCompile>
<ClCompile Include="dosstr.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="endtxt.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="hwsym_sdl.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="i_cdmus.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="i_main.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="i_net.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="i_system.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="i_ttf.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="i_video.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="IMG_xpm.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="mixer_sound.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="ogl_sdl.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="sdl_sound.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="..\hardware\r_opengl\r_opengl.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="..\win32\win_dbg.c">
<Filter>SDLApp</Filter>
</ClCompile>
<ClCompile Include="SDL_main\SDL_windows_main.c">
<Filter>SDLApp</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Image Include="Srb2SDL.ico">
<Filter>SDLApp</Filter>
</Image>
</ItemGroup>
</Project>

2
src/sdl/i_system.c
View File

@ -77,7 +77,7 @@ void __set_fpscr(long); // in libgcc / kernel's startup.s?
#endif
#ifdef HAVE_SDL
#define _MATH_DEFINES_DEFINED
#include "SDL.h"
#ifdef HAVE_TTF

2
src/sdl/i_video.c
View File

@ -26,7 +26,7 @@
#endif
#ifdef HAVE_SDL
#define _MATH_DEFINES_DEFINED
#include "SDL.h"
#ifdef _MSC_VER

1
src/sdl/ogl_sdl.c
View File

@ -22,6 +22,7 @@
#endif
#ifdef HAVE_SDL
#define _MATH_DEFINES_DEFINED
#include "SDL.h"

16
src/win32/SRB2Win_common.props Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link />
<Link>
<AdditionalDependencies>dxguid.lib;winmm.lib;dinput8.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

1669
src/win32/Srb2win-vc10.vcxproj
View File

File diff suppressed because it is too large Load Diff

869
src/win32/Srb2win-vc10.vcxproj.filters Normal file
View File

@ -0,0 +1,869 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="BLUA">
<UniqueIdentifier>{20cba664-c3ef-48f1-85dd-42aafd5345cc}</UniqueIdentifier>
</Filter>
<Filter Include="LUA">
<UniqueIdentifier>{d3817a65-82f5-4989-9217-e5a7f43380a0}</UniqueIdentifier>
</Filter>
<Filter Include="B_Bots">
<UniqueIdentifier>{9c3ed4ae-dbed-4d00-a164-b8bb7fc1710c}</UniqueIdentifier>
</Filter>
<Filter Include="Docs">
<UniqueIdentifier>{4b8a8fb6-7c84-48c2-85d1-0583e6b8cacd}</UniqueIdentifier>
</Filter>
<Filter Include="W_Wad">
<UniqueIdentifier>{1907eee5-0ebf-4325-a2fa-793f089ed2e3}</UniqueIdentifier>
</Filter>
<Filter Include="S_Sounds">
<UniqueIdentifier>{b9e78a3f-3e2b-4f89-9817-b77c7a26d2aa}</UniqueIdentifier>
</Filter>
<Filter Include="R_Rend">
<UniqueIdentifier>{3f336df5-a1d7-4610-9728-4525e42c0abc}</UniqueIdentifier>
</Filter>
<Filter Include="P_Play">
<UniqueIdentifier>{b5090aa0-6645-4091-aa1a-ffc3bf4dc422}</UniqueIdentifier>
</Filter>
<Filter Include="M_Misc">
<UniqueIdentifier>{d59e82c9-68e5-44bf-827e-f7bb1676cd6c}</UniqueIdentifier>
</Filter>
<Filter Include="I_Interface">
<UniqueIdentifier>{29e746a2-3d91-4b69-af6e-5e03895516b7}</UniqueIdentifier>
</Filter>
<Filter Include="Hw_Hardware">
<UniqueIdentifier>{b295d364-61c3-4ebb-9b68-7d6c0bb891be}</UniqueIdentifier>
</Filter>
<Filter Include="H_Hud">
<UniqueIdentifier>{ba258ec5-13d7-4083-98bd-c2ee58700b66}</UniqueIdentifier>
</Filter>
<Filter Include="G_Game">
<UniqueIdentifier>{6163f1e5-da5d-4af2-b92c-753452f9e1d0}</UniqueIdentifier>
</Filter>
<Filter Include="F_Frame">
<UniqueIdentifier>{077b0966-1151-4afa-a533-120a4c931322}</UniqueIdentifier>
</Filter>
<Filter Include="D_Doom">
<UniqueIdentifier>{bded90bc-8019-42b1-ba19-32166743d3e3}</UniqueIdentifier>
</Filter>
<Filter Include="A_Asm">
<UniqueIdentifier>{c0ddfdb5-7494-4cca-b2ad-cb048be9cbdf}</UniqueIdentifier>
</Filter>
<Filter Include="Win32app">
<UniqueIdentifier>{d5157f99-43ef-49cc-ad76-658a1168fc0d}</UniqueIdentifier>
</Filter>
<Filter Include="O_Other">
<UniqueIdentifier>{2cedf139-53a1-40ea-b4de-19e9f4505a1f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="dx_error.c">
<Filter>Win32app</Filter>
</ClCompile>
<ClCompile Include="fabdxlib.c">
<Filter>Win32app</Filter>
</ClCompile>
<ClCompile Include="win_cd.c">
<Filter>Win32app</Filter>
</ClCompile>
<ClCompile Include="win_dbg.c">
<Filter>Win32app</Filter>
</ClCompile>
<ClCompile Include="win_dll.c">
<Filter>Win32app</Filter>
</ClCompile>
<ClCompile Include="win_main.c">
<Filter>Win32app</Filter>
</ClCompile>
<ClCompile Include="win_net.c">
<Filter>Win32app</Filter>
</ClCompile>
<ClCompile Include="win_snd.c">
<Filter>Win32app</Filter>
</ClCompile>
<ClCompile Include="win_sys.c">
<Filter>Win32app</Filter>
</ClCompile>
<ClCompile Include="win_vid.c">
<Filter>Win32app</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_bsp.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_cache.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_draw.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_light.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_main.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_md2.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw_trick.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\hardware\hw3sound.c">
<Filter>Hw_Hardware</Filter>
</ClCompile>
<ClCompile Include="..\blua\lapi.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lauxlib.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lbaselib.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lcode.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ldebug.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ldo.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ldump.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lfunc.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lgc.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\linit.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\llex.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lmem.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lobject.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lopcodes.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lparser.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lstate.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lstring.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lstrlib.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ltable.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ltablib.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\ltm.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lundump.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lvm.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\blua\lzio.c">
<Filter>BLUA</Filter>
</ClCompile>
<ClCompile Include="..\d_clisrv.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\d_main.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\d_net.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\d_netcmd.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\d_netfil.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\dehacked.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\g_game.c">
<Filter>G_Game</Filter>
</ClCompile>
<ClCompile Include="..\g_input.c">
<Filter>G_Game</Filter>
</ClCompile>
<ClCompile Include="..\f_finale.c">
<Filter>F_Frame</Filter>
</ClCompile>
<ClCompile Include="..\f_wipe.c">
<Filter>F_Frame</Filter>
</ClCompile>
<ClCompile Include="..\i_addrinfo.c">
<Filter>I_Interface</Filter>
</ClCompile>
<ClCompile Include="..\i_tcp.c">
<Filter>I_Interface</Filter>
</ClCompile>
<ClCompile Include="..\lua_thinkerlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_baselib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_consolelib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_hooklib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_hudlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_infolib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_maplib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_mathlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_mobjlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_playerlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_script.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\lua_skinlib.c">
<Filter>LUA</Filter>
</ClCompile>
<ClCompile Include="..\m_anigif.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_argv.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_bbox.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_cheat.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_cond.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_fixed.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_menu.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_misc.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_queue.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\m_random.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\md5.c">
<Filter>M_Misc</Filter>
</ClCompile>
<ClCompile Include="..\am_map.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\b_bot.c">
<Filter>B_Bots</Filter>
</ClCompile>
<ClCompile Include="..\p_ceilng.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_enemy.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_floor.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_inter.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_lights.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_map.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_maputl.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_mobj.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_polyobj.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_saveg.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_setup.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_sight.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_slopes.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_spec.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_telept.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_tick.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\p_user.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\r_bsp.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_data.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_draw.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_draw8.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_draw16.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_main.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_plane.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_segs.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_sky.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_splats.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\r_things.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\t_facon.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\t_fsin.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\t_ftan.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\t_tan2a.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\tables.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\sounds.c">
<Filter>S_Sounds</Filter>
</ClCompile>
<ClCompile Include="..\w_wad.c">
<Filter>W_Wad</Filter>
</ClCompile>
<ClCompile Include="..\lzf.c">
<Filter>W_Wad</Filter>
</ClCompile>
<ClCompile Include="..\s_sound.c">
<Filter>S_Sounds</Filter>
</ClCompile>
<ClCompile Include="..\comptime.c">
<Filter>O_Other</Filter>
</ClCompile>
<ClCompile Include="..\command.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\console.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\filesrch.c">
<Filter>I_Interface</Filter>
</ClCompile>
<ClCompile Include="..\hu_stuff.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\info.c">
<Filter>P_Play</Filter>
</ClCompile>
<ClCompile Include="..\mserv.c">
<Filter>I_Interface</Filter>
</ClCompile>
<ClCompile Include="..\st_stuff.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\v_video.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\screen.c">
<Filter>R_Rend</Filter>
</ClCompile>
<ClCompile Include="..\y_inter.c">
<Filter>H_Hud</Filter>
</ClCompile>
<ClCompile Include="..\z_zone.c">
<Filter>D_Doom</Filter>
</ClCompile>
<ClCompile Include="..\string.c">
<Filter>M_Misc</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="afxres.h">
<Filter>Win32app</Filter>
</ClInclude>
<ClInclude Include="dx_error.h">
<Filter>Win32app</Filter>
</ClInclude>
<ClInclude Include="fabdxlib.h">
<Filter>Win32app</Filter>
</ClInclude>
<ClInclude Include="resource.h">
<Filter>Win32app</Filter>
</ClInclude>
<ClInclude Include="win_dbg.h">
<Filter>Win32app</Filter>
</ClInclude>
<ClInclude Include="win_dll.h">
<Filter>Win32app</Filter>
</ClInclude>
<ClInclude Include="win_main.h">
<Filter>Win32app</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_data.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_defs.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_dll.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_drv.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_glide.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_glob.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_light.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_main.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw_md2.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw3dsdrv.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hw3sound.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\hardware\hws_data.h">
<Filter>Hw_Hardware</Filter>
</ClInclude>
<ClInclude Include="..\blua\lapi.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lauxlib.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lcode.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\ldebug.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\ldo.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lfunc.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lgc.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\llex.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\llimits.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lmem.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lobject.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lopcodes.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lparser.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lstate.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lstring.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\ltable.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\ltm.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lua.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\luaconf.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lualib.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lundump.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lvm.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\blua\lzio.h">
<Filter>BLUA</Filter>
</ClInclude>
<ClInclude Include="..\d_clisrv.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_event.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_main.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_net.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_netcmd.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_netfil.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_player.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_think.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\d_ticcmd.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\dehacked.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\doomdata.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\doomdef.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\doomstat.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\doomtype.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\g_game.h">
<Filter>G_Game</Filter>
</ClInclude>
<ClInclude Include="..\g_input.h">
<Filter>G_Game</Filter>
</ClInclude>
<ClInclude Include="..\g_state.h">
<Filter>G_Game</Filter>
</ClInclude>
<ClInclude Include="..\f_finale.h">
<Filter>F_Frame</Filter>
</ClInclude>
<ClInclude Include="..\i_addrinfo.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_joy.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_net.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_sound.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_system.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_tcp.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\i_video.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\lua_hook.h">
<Filter>LUA</Filter>
</ClInclude>
<ClInclude Include="..\lua_hud.h">
<Filter>LUA</Filter>
</ClInclude>
<ClInclude Include="..\lua_libs.h">
<Filter>LUA</Filter>
</ClInclude>
<ClInclude Include="..\lua_script.h">
<Filter>LUA</Filter>
</ClInclude>
<ClInclude Include="..\md5.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_anigif.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_argv.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_bbox.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_cheat.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_cond.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_dllist.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_fixed.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_menu.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_misc.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_queue.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_random.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\m_swap.h">
<Filter>M_Misc</Filter>
</ClInclude>
<ClInclude Include="..\am_map.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\b_bot.h">
<Filter>B_Bots</Filter>
</ClInclude>
<ClInclude Include="..\p_local.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_maputl.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_mobj.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_polyobj.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_pspr.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_saveg.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_setup.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_slopes.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_spec.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\p_tick.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\r_bsp.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_data.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_defs.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_draw.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_local.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_main.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_plane.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_segs.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_sky.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_splats.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_state.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\r_things.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\tables.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\sounds.h">
<Filter>S_Sounds</Filter>
</ClInclude>
<ClInclude Include="..\w_wad.h">
<Filter>W_Wad</Filter>
</ClInclude>
<ClInclude Include="..\lzf.h">
<Filter>W_Wad</Filter>
</ClInclude>
<ClInclude Include="..\byteptr.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\s_sound.h">
<Filter>S_Sounds</Filter>
</ClInclude>
<ClInclude Include="..\comptime.h">
<Filter>O_Other</Filter>
</ClInclude>
<ClInclude Include="..\keys.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\command.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\console.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\endian.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\filesrch.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\hu_stuff.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\info.h">
<Filter>P_Play</Filter>
</ClInclude>
<ClInclude Include="..\mserv.h">
<Filter>I_Interface</Filter>
</ClInclude>
<ClInclude Include="..\p5prof.h">
<Filter>A_Asm</Filter>
</ClInclude>
<ClInclude Include="..\st_stuff.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\v_video.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\screen.h">
<Filter>R_Rend</Filter>
</ClInclude>
<ClInclude Include="..\y_inter.h">
<Filter>H_Hud</Filter>
</ClInclude>
<ClInclude Include="..\z_zone.h">
<Filter>D_Doom</Filter>
</ClInclude>
<ClInclude Include="..\fastcmp.h">
<Filter>O_Other</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="Srb2win.ico">
<Filter>Win32app</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Srb2win.rc">
<Filter>Win32app</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\asm_defs.inc">
<Filter>A_Asm</Filter>
</None>
<None Include="..\config.h.in">
<Filter>O_Other</Filter>
</None>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\tmap.nas">
<Filter>A_Asm</Filter>
</CustomBuild>
<CustomBuild Include="..\tmap_mmx.nas">
<Filter>A_Asm</Filter>
</CustomBuild>
<CustomBuild Include="..\tmap_vc.nas">
<Filter>A_Asm</Filter>
</CustomBuild>
</ItemGroup>
</Project>

2
src/win32/fabdxlib.c
View File

@ -138,7 +138,7 @@ BOOL EnumDirectDrawDisplayModes (APPENUMMODESCALLBACK appFunc)
}
static HINSTANCE DDrawDLL = NULL;
typedef BOOL (WINAPI *DDCreate)(GUID FAR *lpGUID, LPDIRECTDRAW FAR *lplpDD, IUnknown FAR *pUnkOuter);
typedef HRESULT(WINAPI *DDCreate)(GUID FAR *lpGUID, LPDIRECTDRAW FAR *lplpDD, IUnknown FAR *pUnkOuter);
static DDCreate pfnDirectDrawCreate = NULL;
static inline BOOL LoadDirectDraw(VOID)

6
src/win32/win_cd.c
View File

@ -60,7 +60,7 @@ static VOID MCIErrorMessageBox (MCIERROR iErrorCode)
{
char szErrorText[128];
if (!mciGetErrorStringA (iErrorCode, szErrorText, sizeof (szErrorText)))
wsprintfA(szErrorText,"MCI CD Audio Unknown Error #%d\n", iErrorCode);
wsprintfA(szErrorText,"MCI CD Audio Unknown Error #%lu\n", iErrorCode);
I_OutputMsg("%s", szErrorText);
/*MessageBox (GetActiveWindow(), szTemp+1, "LEGACY",
MB_OK | MB_ICONSTOP);*/
@ -180,9 +180,9 @@ static LPSTR hms(UINT seconds)
hours = minutes / 60;
minutes %= 60;
if (hours > 0)
sprintf (s, "%d:%02d:%02d", hours, minutes, seconds);
sprintf (s, "%lu:%02lu:%02lu", hours, minutes, seconds);
else
sprintf (s, "%2d:%02d", minutes, seconds);
sprintf (s, "%2lu:%02lu", minutes, seconds);
return s;
}

11
src/win32/win_dbg.c
View File

@ -412,11 +412,14 @@ LONG WINAPI RecordExceptionInfo(PEXCEPTION_POINTERS data/*, LPCSTR Message, LPST
}
BeenHere = TRUE;
if (Context)
{
#ifdef _X86_
code = (LPBYTE)(size_t)Context->Eip;
code = (LPBYTE)(size_t)Context->Eip;
#elif defined (_AMD64_)
code = (LPBYTE)(size_t)Context->Rip;
code = (LPBYTE)(size_t)Context->Rip;
#endif // || defined (_IA64_)
}
// Create a filename to record the error information to.
// Store it in the executable directory.
@ -628,12 +631,12 @@ LONG WINAPI RecordExceptionInfo(PEXCEPTION_POINTERS data/*, LPCSTR Message, LPST
while(pStack + 1 <= pStackTop)
{
if ((Count % StackColumns) == 0)
output += wsprintf(output, TEXT("%08x: "), pStack);
output += wsprintf(output, TEXT("%p: "), pStack);
if ((++Count % StackColumns) == 0 || pStack + 2 > pStackTop)
Suffix = TEXT("\r\n");
else
Suffix = TEXT(" ");
output += wsprintf(output, TEXT("%08x%s"), *pStack, Suffix);
output += wsprintf(output, TEXT("%p%s"), *pStack, Suffix);
pStack++;
// Check for when the buffer is almost full, and flush it to disk.
if ( output > nearend)

5
src/win32/win_main.c
View File

@ -88,8 +88,7 @@ static LRESULT CALLBACK MainWndproc(HWND hWnd, UINT message, WPARAM wParam, LPAR
if (message == MSHWheelMessage)
{
message = WM_MOUSEWHEEL;
if (win9x)
wParam <<= 16;
wParam <<= 16;
}
//I_OutputMsg("MainWndproc: %p,%i,%i,%i",hWnd, message, wParam, (UINT)lParam);
@ -471,7 +470,7 @@ static inline BOOL tlErrorMessage(const TCHAR *err)
//
// warn user if there is one
//
printf("Error %s..\n", err);
printf("Error %Ts..\n", err);
fflush(stdout);
MessageBox(hWndMain, err, TEXT("ERROR"), MB_OK);

1
src/win32/win_main.h
View File

@ -30,7 +30,6 @@ extern UINT MSHWheelMessage;
extern BOOL nodinput;
BOOL LoadDirectInput(VOID);
extern BOOL win9x;
//faB: midi channel Volume set is delayed by the MIDI stream callback thread, see win_snd.c
#define WM_MSTREAM_UPDATEVOLUME (WM_USER + 101)

25
src/win32/win_sys.c
View File

@ -170,24 +170,6 @@ ticcmd_t *I_BaseTiccmd2(void)
// of win95 etc...
//
BOOL win9x;
/** \brief WinNT system platform
*/
static BOOL winnt;
static void I_DetectWin9x(VOID)
{
OSVERSIONINFO osvi;
osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO);
GetVersionEx(&osvi);
winnt = (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT);
// 95 or 98 what the hell
win9x = true;
}
// return free and total memory in the system
UINT32 I_GetFreeMem(UINT32* total)
{
@ -3095,7 +3077,7 @@ void I_UpdateMumble(const mobj_t *mobj, const listener_t listener)
return;
if(mumble->uiVersion != 2) {
wcsncpy(mumble->name, L"SRB2 "VERSIONSTRING, 256);
wcsncpy(mumble->name, L"SRB2 "VERSIONSTRINGW, 256);
wcsncpy(mumble->description, L"Sonic Robo Blast 2 with integrated Mumble Link support.", 2048);
mumble->uiVersion = 2;
}
@ -3405,7 +3387,7 @@ getBufferedData:
}
static HINSTANCE DInputDLL = NULL;
typedef HRESULT (WINAPI *DICreateA)(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUT *ppDI, LPUNKNOWN punkOuter);
typedef HRESULT (WINAPI *DICreateA)(HINSTANCE hinst, DWORD dwVersion, LPDIRECTINPUTA *ppDI, LPUNKNOWN punkOuter);
static DICreateA pfnDirectInputCreateA = NULL;
BOOL LoadDirectInput(VOID)
@ -3452,9 +3434,6 @@ INT32 I_StartupSystem(void)
// some 'more global than globals' things to initialize here ?
graphics_started = keyboard_started = sound_started = cdaudio_started = false;
I_DetectWin9x();
// check for OS type and version here?
#ifdef NDEBUG
#ifdef BUGTRAP