OpenGL 3.1 core profile support.

[ipdf/code.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index c788f85..95ff5be 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,8 +1,10 @@
 #Makefile
 ARCH := $(shell uname -m)
 #Makefile
 ARCH := $(shell uname -m)

-CXX = g++ -std=gnu++0x -Wall -Werror -Wshadow -pedantic -g
+# TODO: stb_truetype doesn't compile with some of these warnings.
+CXX = g++ -std=gnu++0x -g
+# -Wall -Werror -Wshadow -pedantic

 MAIN = main.o
 MAIN = main.o

-OBJ = log.o document.o view.o screen.o vfpu.o
+OBJ = log.o real.o document.o view.o screen.o vfpu.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o

 LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL
 LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL
 
 LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL
 LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL
 


@@ -21,7 +23,7 @@ MAINRPATH := $(MAINRPATH_$(ARCH))
 TESTRPATH := $(TESTRPATH_$(ARCH))
 CFLAGS := $(CFLAGS_$(ARCH))
 
 TESTRPATH := $(TESTRPATH_$(ARCH))
 CFLAGS := $(CFLAGS_$(ARCH))
 

-
+DEF = -DREAL=1

 
 LINKOBJ = $(OBJPATHS)
 
 
 LINKOBJ = $(OBJPATHS)
 


@@ -29,22 +31,37 @@ RM = rm -f
 BIN = ../bin/ipdf
 
 
 BIN = ../bin/ipdf
 
 

+

 all : $(BIN)
 
 all : $(BIN)
 

+single : DEF = -DREAL=0
+single : $(BIN)
+
+double : DEF = -DREAL=1
+double : $(BIN)
+
+# The tests will compile with the default REAL definition
+# To change that you can run as `make DEFS="REAL=X" tests/<target>` where X is your chosen type
+# But remember to make clean first.

 tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ)
        $(CXX) -o [email protected] $(LINKOBJ) ../obj/[email protected] $(LIB) $(TESTRPATH)
 
 tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ)
        $(CXX) -o [email protected] $(LINKOBJ) ../obj/[email protected] $(LIB) $(TESTRPATH)
 

+-include $(DEPS)
+

 runtests : tests/runtests.sh
        cd tests; ./runtests.sh
 
 
 $(BIN) : $(LINKOBJ) ../obj/$(MAIN)
 runtests : tests/runtests.sh
        cd tests; ./runtests.sh
 
 
 $(BIN) : $(LINKOBJ) ../obj/$(MAIN)

+       echo $(LINKOBJ)

        @mkdir -p $(dir $@)
        $(CXX) -o $(BIN) $(LINKOBJ) ../obj/$(MAIN) $(LIB) $(MAINRPATH)
 
        @mkdir -p $(dir $@)
        $(CXX) -o $(BIN) $(LINKOBJ) ../obj/$(MAIN) $(LIB) $(MAINRPATH)
 

+-include $(DEPS)
+

 ../obj/%.o : %.cpp
        @mkdir -p $(dir $@)
 ../obj/%.o : %.cpp
        @mkdir -p $(dir $@)

-       $(CXX) $(CFLAGS) -c -MMD -o $@ $<
+       $(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<

 
 -include $(DEPS)
 
 
 -include $(DEPS)