diff options
| author | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-29 12:43:03 +0200 |
|---|---|---|
| committer | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-29 12:43:03 +0200 |
| commit | 214e2599599d5132234a28ff6852dc2d0eeb8d21 (patch) | |
| tree | c74f452007aed32afe47a1be3d0985cba3f91f4d | |
| parent | 7b11fe4278eb1ff7d854ab789580e2b7dc361616 (diff) | |
Removed cross-compile stuff from Makefile.win32.
| -rw-r--r-- | Makefile.win32 | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/Makefile.win32 b/Makefile.win32 index 30cbd94..882ec89 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -1,35 +1,19 @@ -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 +CXX=g++ +LD=g++ +ROOT=C:\MinGW +RM=del TARGET=foo.exe OBJECTS=gl.o gui.o main.o scene.o shader.o scripting.o terrain_cache.o terrain.o terrain_loader.o tool.o vector.o video.o -ifeq ($(shell uname), Linux) - OBJECTS+=noiseutils/noiseutils.o scripting/tolua_test.o scripting/test.o widgets/FormattedListboxTextItem.o -else - OBJECTS+=noiseutils\noiseutils.o scripting\tolua_test.o scripting\test.o widgets\FormattedListboxTextItem.o -endif +OBJECTS+=noiseutils\noiseutils.o scripting\tolua_test.o scripting\test.o widgets\FormattedListboxTextItem.o -#-D_GNU_SOURCE=1 -D_REENTRANT -CPPFLAGS=-I$(ROOT)/include/SDL -I$(ROOT)/include/CEGUI/ -I$(ROOT)/include/freetype2 -I. -Wall -g -mconsole #-mwin32 -LDFLAGS=-L$(ROOT)/lib -static-libgcc -static-libstdc++ +CPPFLAGS=-I$(ROOT)\include/SDL -I$(ROOT)\include\CEGUI -I$(ROOT)\include\freetype2 -I. -Wall -g -mconsole +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 -llua -ltolua++_Static -ifeq ($(shell uname), Linux) - LDFLAGS+=-lboost_filesystem-mt-s -lboost_system-mt-s -else - LDFLAGS+=-lboost_filesystem -lboost_system -endif +LDFLAGS+=-lboost_filesystem -lboost_system all: $(TARGET) |