diff options
| author | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-28 21:59:42 +0200 |
|---|---|---|
| committer | Jon Bergli Heier <snakebite@jvnv.net> | 2011-05-28 21:59:42 +0200 |
| commit | 6a02d4e2ac5b602febf96d8be792187d14375d9b (patch) | |
| tree | d14d55eb7d21f24571a78efb388e7666f205784d | |
| parent | 91458d9a72fc0e74d4a6601221bbeaba907bfa85 (diff) | |
Updated win32 makefile.
| -rw-r--r-- | Makefile.win32 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.win32 b/Makefile.win32 index c15c41c..30cbd94 100644 --- a/Makefile.win32 +++ b/Makefile.win32 @@ -11,19 +11,19 @@ else endif TARGET=foo.exe -OBJECTS=gl.o gui.o main.o scene.o shader.o terrain_cache.o terrain.o terrain_loader.o tool.o vector.o video.o +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 + OBJECTS+=noiseutils/noiseutils.o scripting/tolua_test.o scripting/test.o widgets/FormattedListboxTextItem.o else - OBJECTS+=noiseutils\noiseutils.o + OBJECTS+=noiseutils\noiseutils.o scripting\tolua_test.o scripting\test.o widgets\FormattedListboxTextItem.o endif #-D_GNU_SOURCE=1 -D_REENTRANT -CPPFLAGS=-I$(ROOT)/include/SDL -I$(ROOT)/include/CEGUI/ -I$(ROOT)/include/freetype2 -Wall -g -mconsole #-mwin32 +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++ LDFLAGS+=-lCEGUIOpenGLRenderer -lCEGUIBase -lCEGUITGAImageCodec -lCEGUITinyXMLParser -lCEGUIFalagardWRBase -lCEGUISILLYImageCodec -LDFLAGS+=-lSDL_image -lftgl -lfreetype-s -lz -lpcre -lopengl32 -lglu32 -lwinmm -lmingw32 -lSDLmain -lSDL -ljpeg -lnoise +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 |