diff options
| author | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-12 16:04:53 +0200 |
|---|---|---|
| committer | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-12 16:04:53 +0200 |
| commit | 07ec7829e75a71fa7b70b513f0a2c7daeaea11d5 (patch) | |
| tree | 3006e35dce2e2ac0fa970a19df406eb9b4b95fc5 | |
| parent | 40079a61d9269e54379985d16795c30499044ed5 (diff) | |
Minor cross-compile fixes.
| -rw-r--r-- | Makefile.win32 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.win32 b/Makefile.win32 index 4b64070..91e3f22 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -2,10 +2,12 @@ ifeq ($(shell uname), Linux) CXX=i486-mingw32-g++ LD=i486-mingw32-g++ ROOT=/usr/i486-mingw32 + RM=rm -f else CXX=g++ LD=g++ ROOT=C:/MinGW + RM=del endif TARGET=foo.exe @@ -20,8 +22,9 @@ endif #-D_GNU_SOURCE=1 -D_REENTRANT CPPFLAGS=-I$(ROOT)/include/SDL -I$(ROOT)/include/CEGUI/ -I$(ROOT)/include/freetype2 -Wall -g -mconsole #-mwin32 -LDFLAGS=-L$(ROOT)/lib -lCEGUIOpenGLRenderer -lCEGUIBase -lCEGUITGAImageCodec -lCEGUITinyXMLParser -lCEGUIFalagardWRBase -lCEGUISILLYImageCodec -LDFLAGS+=-lSDL_image -lftgl -lfreetype -lz -lpcre -lopengl32 -lglu32 -lwinmm -lmingw32 -lSDLmain -lSDL -ljpeg -lstdc++ -lnoise +LDFLAGS=-L$(ROOT)/lib -static-libgcc -static-libstdc++ +LDFLAGS+=-lCEGUIOpenGLRenderer -lCEGUIBase -lCEGUITGAImageCodec -lCEGUITinyXMLParser -lCEGUIFalagardWRBase -lCEGUISILLYImageCodec +LDFLAGS+=-lSDL_image -lftgl -lfreetype-s -lz -lpcre -lopengl32 -lglu32 -lwinmm -lmingw32 -lSDLmain -lSDL -ljpeg -lnoise ifeq ($(shell uname), Linux) LDFLAGS+=-lboost_filesystem-mt-s -lboost_system-mt-s @@ -35,4 +38,4 @@ $(TARGET): $(OBJECTS) $(LD) -o $@ $^ $(LDFLAGS) clean: - del $(OBJECTS) $(TARGET) + ${RM} $(OBJECTS) $(TARGET) |