From 44060cc000b60519aa9366cc77b45743b891b330 Mon Sep 17 00:00:00 2001
From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 27 Feb 2010 18:08:26 +0000
Subject: [PATCH] try to fix all project files (to add winmm)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10024 d7cf8633-e32d-0410-b094-e92efae38249
---
 darkplaces-sdl.dev    | 10 +---------
 darkplaces-sdl.dsp    |  4 ++--
 darkplaces-sdl.vcproj | 12 ++++++------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/darkplaces-sdl.dev b/darkplaces-sdl.dev
index bd3b77cf..cdef255f 100755
--- a/darkplaces-sdl.dev
+++ b/darkplaces-sdl.dev
@@ -1,15 +1,7 @@
 [Project]
 FileName=darkplaces-sdl.dev
 Name=DarkPlaces
-<<<<<<< .mine
-<<<<<<< .mine
-UnitCount=182
-=======
-UnitCount=175
-=======
 UnitCount=183
->>>>>>> .r9892
->>>>>>> .r9586
 Type=0
 Ver=1
 ObjFiles=
@@ -20,7 +12,7 @@ ResourceIncludes=
 MakeIncludes=
 Compiler=-Wall -O2 -fno-strict-aliasing -ffast-math -funroll-loops -D_GNU_SOURCE=1 -Dmain=SDL_main_@@__@@_
 CppCompiler=
-Linker=-lws2_32 -luser32 -lgdi32 -lcomctl32 -Wl,--large-address-aware -lmingw32 -lSDLmain -lSDL  -mwindows_@@__@@_
+Linker=-lwinmm -lws2_32 -luser32 -lgdi32 -lcomctl32 -Wl,--large-address-aware -lmingw32 -lSDLmain -lSDL  -mwindows_@@__@@_
 IsCpp=0
 Icon=
 ExeOutput=
diff --git a/darkplaces-sdl.dsp b/darkplaces-sdl.dsp
index ce8f9b06..96291cf5 100644
--- a/darkplaces-sdl.dsp
+++ b/darkplaces-sdl.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 ws2_32.lib sdl.lib sdlmain.lib user32.lib /nologo /subsystem:console /LARGEADDRESSAWARE /machine:I386 /libpath:"SDL/lib"
+# ADD LINK32 ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib /nologo /subsystem:console /LARGEADDRESSAWARE /machine:I386 /libpath:"SDL/lib"
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "darkplaces-sdl - Win32 Debug"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 ws2_32.lib sdl.lib sdlmain.lib user32.lib /nologo /subsystem:console /LARGEADDRESSAWARE /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"Debug-SDL/darkplaces-sdl-debug.exe" /pdbtype:sept /libpath:"SDL/lib"
+# ADD LINK32 ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib /nologo /subsystem:console /LARGEADDRESSAWARE /debug /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"Debug-SDL/darkplaces-sdl-debug.exe" /pdbtype:sept /libpath:"SDL/lib"
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
diff --git a/darkplaces-sdl.vcproj b/darkplaces-sdl.vcproj
index 9e03b72e..75ff140a 100755
--- a/darkplaces-sdl.vcproj
+++ b/darkplaces-sdl.vcproj
@@ -74,7 +74,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"
+				AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"
 				OutputFile="$(OutDir)\darkplaces-sdl.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
@@ -164,7 +164,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"
+				AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"
 				OutputFile="$(OutDir)\darkplaces-sdl.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
@@ -253,7 +253,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"
+				AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"
 				OutputFile="$(OutDir)\darkplaces-sdl-debug.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
@@ -344,7 +344,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"
+				AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"
 				OutputFile="$(OutDir)\darkplaces-sdl-debug.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories=""
@@ -434,7 +434,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"
+				AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"
 				OutputFile="$(OutDir)\darkplaces-sdl.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
@@ -526,7 +526,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"
+				AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"
 				OutputFile="$(OutDir)\darkplaces-sdl.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories=""
-- 
2.39.2