summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-02-12 12:53:11 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-02-12 12:53:11 (GMT)
commitec6d1012b263049241984dfc96fae37f4280e7eb (patch)
treeccd5196e7cb207dba032838dfb783dc438030f4c /Makefile
parentd604fac18f611685f90c724ee84a7bc6c63da309 (diff)
downloadpowder-ec6d1012b263049241984dfc96fae37f4280e7eb.zip
powder-ec6d1012b263049241984dfc96fae37f4280e7eb.tar.gz
Somewhat working lua console, no element function overrides, no keyboard, mouse or tick events
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 4c11e2b..043fe0b 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ OBJS := $(patsubst src/%.cpp,build/obj/%.o,$(SOURCES))
FOLDERS :=
CFLAGS := -w -Isrc/ -Idata/
-OFLAGS := -fkeep-inline-functions -O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations -msse2
+OFLAGS := -fkeep-inline-functions
CPPC := g++
CPPC_WIN := g++
@@ -19,14 +19,14 @@ powder.exe: build/powder.exe
powder-release: build/powder-release
powder: build/powder
-build/powder-release.exe: CFLAGS += -DWIN32
-build/powder-release.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -mwindows
+build/powder-release.exe: CFLAGS += -DWIN32 -O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations -pipe -msse -msse2 -msse3 -mmmx
+build/powder-release.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -mwindows
build/powder.exe: CFLAGS += -DWIN32 -DWINCONSOLE
-build/powder.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 #-mwindows
-build/powder-release: CFLAGS += -DLIN32
-build/powder-release: LFLAGS := -lSDL -lm -lbz2
+build/powder.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua #-mwindows
+build/powder-release: CFLAGS += -DLIN32 -O3 -ffast-math -ftree-vectorize -funsafe-math-optimizations -pipe -msse -msse2 -msse3 -mmmx
+build/powder-release: LFLAGS := -lSDL -lm -lbz2 -llua
build/powder: CFLAGS += -DLIN32
-build/powder: LFLAGS := -lSDL -lm -lbz2
+build/powder: LFLAGS := -lSDL -lm -lbz2 -llua
build/powder-release.exe: $(SOURCES) build/powder-res.o
$(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) build/powder-res.o -o $@
@@ -38,8 +38,8 @@ build/powder-release: $(SOURCES)
$(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) -o $@
strip $@
-build/powder.exe: buildpaths-powder.exe $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS))
- $(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) $(LFLAGS) -o $@ -ggdb
+build/powder.exe: buildpaths-powder.exe $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o
+ $(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o $(LFLAGS) -o $@ -ggdb
build/obj/powder.exe/%.o: src/%.cpp $(HEADERS)
$(CPPC_WIN) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb
buildpaths-powder.exe: