Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use winsock 2 on all build systems (not just autohell like in r7284) 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7297 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2009-05-03 15:25:41 +00:00 committed by Git SVN Gateway
parent a8f8357904
commit 9c340eb3f7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makerules/configure.mk
View File

@ -73,7 +73,7 @@ CC:=gcc
CXX:=g++
WINDRES:=windres
WZ_CPPFLAGS+=-DWIN32
WZ_LDFLAGS+=-mwindows -lmingw32 -lSDLmain -lSDL -lpng12 -lphysfs -lz -lvorbisfile -lvorbis -logg -lpopt -lintl -lGLC -lglu32 -lopengl32 -lopenal32 -ldbghelp -lshfolder -lwinmm -lwsock32 -lbfd -liberty -liconv -lz -lfreetype -lfontconfig -lexpat -ltheora
WZ_LDFLAGS+=-mwindows -lmingw32 -lSDLmain -lSDL -lpng12 -lphysfs -lz -lvorbisfile -lvorbis -logg -lpopt -lintl -lGLC -lglu32 -lopengl32 -lopenal32 -ldbghelp -lshfolder -lwinmm -lws2_32 -lbfd -liberty -liconv -lz -lfreetype -lfontconfig -lexpat -ltheora
# Import environment variables

4
warzone2100.cbp
View File

@ -105,7 +105,7 @@
<Add library="openal32" />
<Add library="dbghelp" />
<Add library="winmm" />
<Add library="wsock32" />
<Add library="ws2_32" />
<Add library="intl" />
<Add library="freetype" />
<Add library="fontconfig" />
@ -150,7 +150,7 @@
<Add library="openal32" />
<Add library="dbghelp" />
<Add library="winmm" />
<Add library="wsock32" />
<Add library="ws2_32" />
<Add library="intl" />
<Add library="freetype" />
<Add library="fontconfig" />

4
win32/Warzone2100.vcproj
View File

@ -79,7 +79,7 @@
<Tool
Name="VCLinkerTool"
ExecutionBucket="11"
AdditionalDependencies="SDL.lib SDLmain.lib libpng-static.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib OpenAL32.lib glc32.lib OpenGL32.lib GLU32.lib shfolder.lib winmm.lib wsock32.lib dbghelp.lib libpopt.lib physfs.lib zlib.lib libtheora.lib"
AdditionalDependencies="SDL.lib SDLmain.lib libpng-static.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib OpenAL32.lib glc32.lib OpenGL32.lib GLU32.lib shfolder.lib winmm.lib ws2_32.lib dbghelp.lib libpopt.lib physfs.lib zlib.lib libtheora.lib"
OutputFile="$(OutDir)\$(ProjectName)-Dbg.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\devpkg\lib&quot;"
@ -179,7 +179,7 @@
<Tool
Name="VCLinkerTool"
ExecutionBucket="11"
AdditionalDependencies="SDL.lib SDLmain.lib libpng-static.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib OpenAL32.lib glc32.lib OpenGL32.lib GLU32.lib shfolder.lib winmm.lib wsock32.lib dbghelp.lib libpopt.lib physfs.lib zlib.lib libtheora.lib"
AdditionalDependencies="SDL.lib SDLmain.lib libpng-static.lib ogg_static.lib vorbis_static.lib vorbisfile_static.lib OpenAL32.lib glc32.lib OpenGL32.lib GLU32.lib shfolder.lib winmm.lib ws2_32.lib dbghelp.lib libpopt.lib physfs.lib zlib.lib libtheora.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="&quot;$(SolutionDir)\..\devpkg\lib&quot;"
IgnoreDefaultLibraryNames="libcmt.lib"