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

- Move libraries to satisfy our dep's deps out of the PLATFORM choice, since they would be the same for windows and mingw32. 

- Link against GLC instead of glc32 for windows, since that is what the devpkg contains.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3418 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2008-01-09 20:26:29 +00:00
parent f6a9f7c864
commit e7ed93d5f9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makerules/configure.mk
View File

@ -97,15 +97,15 @@ endif
# Generic libs
LDFLAGS+=-lSDL -lSDL_net -lpng -lphysfs -lz -lvorbisfile -lvorbis -logg -lpopt -lintl
LDFLAGS+=-lSDL -lSDL_net -lpng -lphysfs -lz -lvorbisfile -lvorbis -logg -lpopt -lintl -liconv -lz -lfreetype -lfontconfig -lexpat
# Additional platform-dependend libs
ifeq ($(strip $(PLATFORM)),windows)
LDFLAGS+=-lintl -liconv -lz -lfreetype -lfontconfig -lexpat -lglc32 -lglu32 -lopengl32 -lopenal32 -ldbghelp -lshfolder -lwinmm -lwsock32
LDFLAGS+=-lGLC -lglu32 -lopengl32 -lopenal32 -ldbghelp -lshfolder -lwinmm -lwsock32
else
ifeq ($(strip $(PLATFORM)),mingw32)
LDFLAGS+=-ldbghelp -lshfolder -lwinmm -lwsock32 -lglc32 -lglu32 -lopengl32 -lopenal32
LDFLAGS+=-lglc32 -lglu32 -lopengl32 -lopenal32 -ldbghelp -lshfolder -lwinmm -lwsock32
else
LDFLAGS+=-lGLC -lGLU -lGL -lopenal
endif