diff options
| author | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-10 16:46:26 +0200 |
|---|---|---|
| committer | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-10 16:46:26 +0200 |
| commit | d42ec5c0e89559abd276334b6c4804e1eaa5e9c7 (patch) | |
| tree | c6afda3e3f51d4ac79ffcdabd2edfc6d36df4201 /Makefile.win32 | |
| parent | fa1216b691dc5be3429858dcff845239b1aec417 (diff) | |
| parent | 7d93cab1eb1629b068858a68ac5e5840fe84a83a (diff) | |
Merge branch 'master' into win32
Conflicts:
gui.h
quadtree.cpp
scene.cpp
scene.h
Diffstat (limited to 'Makefile.win32')
| -rw-r--r-- | Makefile.win32 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.win32 b/Makefile.win32 index f63789a..9981c58 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -2,11 +2,11 @@ CXX=g++ LD=g++ TARGET=foo.exe #OBJECTS=$(shell ls *.cpp | sed 's/cpp/o/') -OBJECTS=gl.o gui.o main.o quadtree.o scene.o shader.o tool.o vector.o video.o +OBJECTS=gl.o gui.o main.o terrain.o noiseutils/noiseutils.o scene.o shader.o tool.o vector.o video.o #-D_GNU_SOURCE=1 -D_REENTRANT CPPFLAGS=-IC:/mingw/include/SDL -IC:/mingw/include/CEGUI/ -g -mconsole #-mwin32 -LDFLAGS=-lCEGUIOpenGLRenderer -lCEGUIBase -lCEGUITGAImageCodec -lCEGUITinyXMLParser -lCEGUIFalagardWRBase -LDFLAGS+=-lSDL_image -lfreetype -lz -lpcre -lopengl32 -lglu32 -lwinmm -lmingw32 -lSDLmain -lSDL -ljpeg -lstdc++ +LDFLAGS=-lCEGUIOpenGLRenderer -lCEGUIBase -lCEGUITGAImageCodec -lCEGUITinyXMLParser -lCEGUIFalagardWRBase -lCEGUISILLYImageCodec +LDFLAGS+=-lSDL_image -lfreetype -lz -lpcre -lopengl32 -lglu32 -lwinmm -lmingw32 -lSDLmain -lSDL -ljpeg -lstdc++ -lboost_filesystem -lboost_system -lnoise all: $(TARGET) |