summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.win3210
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