ref: 031dbfb4ccd727ef660f72774cb767885fd9eae6
parent: 66f090f08bca46ce8705a892600611db0ea686bf
parent: 7bc079365263468aa76aeba0d21a70693423ea71
author: Fabian Greffrath <fabian@greffrath.com>
date: Sat Sep 19 17:02:38 EDT 2015
Merge branch 'sdl2-branch' of https://github.com/chocolate-doom/chocolate-doom into sdl2-branch
--- a/msvc/doom.vcproj
+++ b/msvc/doom.vcproj
@@ -66,7 +66,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
+ AdditionalDependencies="SDL2_mixer.lib SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-doom-dbg.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="msvcrt"
@@ -148,7 +148,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
+ AdditionalDependencies="SDL2_mixer.lib SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-doom.exe"
LinkIncremental="0"
IgnoreDefaultLibraryNames="msvcrtd"
@@ -856,6 +856,10 @@
</File>
<File
RelativePath="..\src\doom\deh_ammo.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\doom\deh_bexstr.c"
>
</File>
<File
--- a/msvc/heretic.vcproj
+++ b/msvc/heretic.vcproj
@@ -60,7 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
+ AdditionalDependencies="SDL2_mixer.lib SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-heretic-dbg.exe"
IgnoreDefaultLibraryNames="msvcrt"
GenerateDebugInformation="true"
@@ -140,7 +140,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
+ AdditionalDependencies="SDL2_mixer.lib SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-heretic.exe"
LinkIncremental="0"
IgnoreDefaultLibraryNames="msvcrtd"
@@ -466,10 +466,6 @@
</File>
<File
RelativePath="..\src\heretic\g_game.c"
- >
- </File>
- <File
- RelativePath="..\src\heretic\i_sound.c"
>
</File>
<File
--- a/msvc/hexen.vcproj
+++ b/msvc/hexen.vcproj
@@ -60,7 +60,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
+ AdditionalDependencies="SDL2_mixer.lib SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-hexen-dbg.exe"
IgnoreAllDefaultLibraries="false"
IgnoreDefaultLibraryNames="msvcrt"
@@ -141,7 +141,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
+ AdditionalDependencies="SDL2_mixer.lib SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-hexen.exe"
LinkIncremental="0"
IgnoreDefaultLibraryNames="msvcrtd"
@@ -426,19 +426,11 @@
>
</File>
<File
- RelativePath="..\src\hexen\i_sound.c"
- >
- </File>
- <File
RelativePath="..\src\hexen\in_lude.c"
>
</File>
<File
RelativePath="..\src\hexen\info.c"
- >
- </File>
- <File
- RelativePath="..\src\hexen\m_misc.c"
>
</File>
<File
--- a/msvc/server.vcproj
+++ b/msvc/server.vcproj
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_net.lib SDLmain.lib"
+ AdditionalDependencies="SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-server-dbg.exe"
IgnoreDefaultLibraryNames="msvcrt"
GenerateDebugInformation="true"
@@ -139,7 +139,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_net.lib SDLmain.lib"
+ AdditionalDependencies="SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-server.exe"
IgnoreDefaultLibraryNames="msvcrtd"
GenerateDebugInformation="false"
--- a/msvc/setup.vcproj
+++ b/msvc/setup.vcproj
@@ -61,7 +61,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDLmain.lib SDL_net.lib"
+ AdditionalDependencies="SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-setup-dbg.exe"
IgnoreDefaultLibraryNames="msvcrt"
GenerateDebugInformation="true"
@@ -139,7 +139,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDLmain.lib SDL_net.lib"
+ AdditionalDependencies="SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-setup.exe"
IgnoreDefaultLibraryNames="msvcrtd"
GenerateDebugInformation="false"
--- a/msvc/strife.vcproj
+++ b/msvc/strife.vcproj
@@ -66,7 +66,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
+ AdditionalDependencies="SDL2_mixer.lib SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-strife-dbg.exe"
LinkIncremental="2"
IgnoreDefaultLibraryNames="msvcrt"
@@ -148,7 +148,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL.lib SDL_mixer.lib SDL_net.lib SDLmain.lib"
+ AdditionalDependencies="SDL2_mixer.lib SDL2_net.lib SDL2main.lib SDL2.lib"
OutputFile="$(OutDir)\chocolate-strife.exe"
LinkIncremental="0"
IgnoreDefaultLibraryNames="msvcrtd"
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -159,10 +159,10 @@
static SDL_Texture *texture_upscaled = NULL;
static SDL_Rect blit_rect = {- .h = SCREENHEIGHT,
- .w = SCREENWIDTH,
- .x = 0,
- .y = 0,
+ 0,
+ 0,
+ SCREENWIDTH,
+ SCREENHEIGHT
};
// palette