X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=fee307db0dca8b35790fb94126977e512d82449c;hp=fd0b81b78dc21df4c0aea127a07e964972aec596;hb=a8297c3461718f2d9afc7a2f8ca620d320ac5f97;hpb=326f04a375ce3120f7e8957e3d7cd5f296f513e3

diff --git a/src/Makefile b/src/Makefile
index fd0b81b..fee307d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,9 +1,16 @@
 #Makefile
 ARCH := $(shell uname -m)
 # TODO: stb_truetype doesn't compile with some of these warnings.
-CXX = g++ -std=c++0x -g -Wall -Werror -Wshadow -pedantic -rdynamic
+
+# This seemed like a good idea 2 hours ago ok...
+ifeq ($(ARCH), win32)
+	CXX = i686-w64-mingw32-g++ -std=c++11 -g -Wall -Werror -Wshadow -pedantic
+else
+	CXX = g++ -std=c++11 -g -Wall -Werror -Wshadow -pedantic -rdynamic
+endif
+
 MAIN = main.o
-OBJ = log.o real.o bezier.o objectrenderer.o view.o screen.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o  path.o document.o debugscript.o
+OBJ = log.o profiler.o real.o bezier.o objectrenderer.o view.o screen.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o  path.o document.o debugscript.o paranoidnumber.o
 
 QT_INCLUDE := -I/usr/share/qt4/mkspecs/linux-g++-64 -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -Itests -I.
 QT_DEF := -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
@@ -12,23 +19,28 @@ QT_LIB :=  -L/usr/lib/x86_64-linux-gnu -lQtGui -lQtCore -lpthread
 LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL -lgmp
 LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL -lgmp
 LIB_i686 = $(LIB_i386)
+LIB_win32 = -mwindows -lmingw32 -L../contrib/win32/lib/ -lSDL2main -lSDL2 -lgmp -static-libgcc -lopengl32 -static-libstdc++
 
 MAINRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../contrib/lib'
 MAINRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32'
 MAINRPATH_i686 = $(MAINRPATH_i386)
+MAINRPATH_win32 = -Wl,-rpath,'$$ORIGIN/../contrib/win32/lib'
 TESTRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib'
 TESTRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib32'
 TESTRPATH_i686 = $(TESTRPATH_i386)
+TESTRPATH_win32 = -Wl,-rpath,'$$ORIGIN/../../contrib/win32/lib'
 OBJPATHS = $(OBJ:%=../obj/%)
 DEPS := $(OBJPATHS:%.o=%.d)
 CFLAGS_x86_64 := -I../contrib/include/SDL2 -I`pwd`
 CFLAGS_i386 := -I../contrib/include32/SDL2 -I`pwd`
 CFLAGS_i686 := $(CFLAGS_i386)
+CFLAGS_win32 := -I../contrib/win32/include/SDL2 -I`pwd` -I../contrib/win32/include
 
 
 LIB := $(LIB_$(ARCH))
 MAINRPATH := $(MAINRPATH_$(ARCH))
 TESTRPATH := $(TESTRPATH_$(ARCH))
+
 CFLAGS := $(CFLAGS_$(ARCH))
 
 RM = rm -f
@@ -36,7 +48,9 @@ BIN = ../bin/ipdf
 REALTYPE=1
 CONTROLPANEL=enabled
 QUADTREE=disabled
-DEF = -DREALTYPE=$(REALTYPE) 
+DEF = -DREALTYPE=$(REALTYPE)
+
+
 
 ## Only link with things we care about
 
@@ -74,7 +88,7 @@ ifeq ($(REALTYPE),7)
 endif
 
 ifeq ($(REALTYPE),8)
-	OBJ := $(OBJ) paranoidnumber.o
+	OBJ := $(OBJ) 
 endif 
 
 ifeq ($(REALTYPE),9)
@@ -144,7 +158,7 @@ clean_bin :
 	$(RM) $(BIN)
 
 clean :
-	$(RM) $(BIN) $(DEPS) $(LINKOBJ) ../obj/$(MAIN)
+	$(RM) $(BIN) $(DEPS) $(LINKOBJ) ../obj/$(MAIN) ../obj/quadtree.?
 	$(RM) tests/*~
 	$(RM) tests/*.test
 	$(RM) tests/*.out