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

diff --git a/darkplaces-sdl.dev b/darkplaces-sdl.dev
index bd3b77cfe6bc974686dcd9832eead7bdad3b7bd7..cdef255fac51f3a21439317cd2f74301f487648b 100755 (executable)
--- a/darkplaces-sdl.dev
+++ b/darkplaces-sdl.dev
@@ -1,15 +1,7 @@
 [Project]\r
 FileName=darkplaces-sdl.dev\r
 Name=DarkPlaces\r
 [Project]\r
 FileName=darkplaces-sdl.dev\r
 Name=DarkPlaces\r

-<<<<<<< .mine\r
-<<<<<<< .mine\r
-UnitCount=182\r
-=======\r
-UnitCount=175\r
-=======\r

 UnitCount=183\r
 UnitCount=183\r

->>>>>>> .r9892\r
->>>>>>> .r9586\r

 Type=0\r
 Ver=1\r
 ObjFiles=\r
 Type=0\r
 Ver=1\r
 ObjFiles=\r


@@ -20,7 +12,7 @@ ResourceIncludes=
 MakeIncludes=\r
 Compiler=-Wall -O2 -fno-strict-aliasing -ffast-math -funroll-loops -D_GNU_SOURCE=1 -Dmain=SDL_main_@@__@@_\r
 CppCompiler=\r
 MakeIncludes=\r
 Compiler=-Wall -O2 -fno-strict-aliasing -ffast-math -funroll-loops -D_GNU_SOURCE=1 -Dmain=SDL_main_@@__@@_\r
 CppCompiler=\r

-Linker=-lws2_32 -luser32 -lgdi32 -lcomctl32 -Wl,--large-address-aware -lmingw32 -lSDLmain -lSDL  -mwindows_@@__@@_\r
+Linker=-lwinmm -lws2_32 -luser32 -lgdi32 -lcomctl32 -Wl,--large-address-aware -lmingw32 -lSDLmain -lSDL  -mwindows_@@__@@_\r

 IsCpp=0\r
 Icon=\r
 ExeOutput=\r
 IsCpp=0\r
 Icon=\r
 ExeOutput=\r

diff --git a/darkplaces-sdl.dsp b/darkplaces-sdl.dsp
index ce8f9b06c5e15a2910329772d784a5d1a38f4d3d..96291cf55674323ddc52645ae78effd8f0f3a428 100644 (file)
--- a/darkplaces-sdl.dsp
+++ b/darkplaces-sdl.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /machine:I386\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /machine:I386\r

-# ADD LINK32 ws2_32.lib sdl.lib sdlmain.lib user32.lib /nologo /subsystem:console /LARGEADDRESSAWARE /machine:I386 /libpath:"SDL/lib"\r
+# ADD LINK32 ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib /nologo /subsystem:console /LARGEADDRESSAWARE /machine:I386 /libpath:"SDL/lib"\r

 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "darkplaces-sdl - Win32 Debug"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "darkplaces-sdl - Win32 Debug"\r


@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\r

-# 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"\r
+# 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"\r

 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/darkplaces-sdl.vcproj b/darkplaces-sdl.vcproj
index 9e03b72e533484d4a26e3b01ca9c941c53426d59..75ff140afd8014804e6165383337e7f77618cf8a 100755 (executable)
--- a/darkplaces-sdl.vcproj
+++ b/darkplaces-sdl.vcproj
@@ -74,7 +74,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"\r
+                               AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"\r

                                OutputFile="$(OutDir)\darkplaces-sdl.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories=""\r
                                OutputFile="$(OutDir)\darkplaces-sdl.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories=""\r


@@ -164,7 +164,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"\r
+                               AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"\r

                                OutputFile="$(OutDir)\darkplaces-sdl.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories=""\r
                                OutputFile="$(OutDir)\darkplaces-sdl.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories=""\r


@@ -253,7 +253,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"\r
+                               AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"\r

                                OutputFile="$(OutDir)\darkplaces-sdl-debug.exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories=""\r
                                OutputFile="$(OutDir)\darkplaces-sdl-debug.exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories=""\r


@@ -344,7 +344,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"\r
+                               AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"\r

                                OutputFile="$(OutDir)\darkplaces-sdl-debug.exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories=""\r
                                OutputFile="$(OutDir)\darkplaces-sdl-debug.exe"\r
                                LinkIncremental="2"\r
                                AdditionalLibraryDirectories=""\r


@@ -434,7 +434,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"\r
+                               AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"\r

                                OutputFile="$(OutDir)\darkplaces-sdl.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories=""\r
                                OutputFile="$(OutDir)\darkplaces-sdl.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories=""\r


@@ -526,7 +526,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="ws2_32.lib sdl.lib sdlmain.lib user32.lib"\r
+                               AdditionalDependencies="ws2_32.lib winmm.lib sdl.lib sdlmain.lib user32.lib"\r

                                OutputFile="$(OutDir)\darkplaces-sdl.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories=""\r
                                OutputFile="$(OutDir)\darkplaces-sdl.exe"\r
                                LinkIncremental="1"\r
                                AdditionalLibraryDirectories=""\r