X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=64408edcb76542c0c14bd5c1704c7fc193703f7a;hp=ac23acc4c47444115b3075c1465d833eed362c5b;hb=85e08223a33439f9b4911129b48ee45ff65869eb;hpb=d3e941df79b54b698a5b8a1d4763346c4d6eb3d7 diff --git a/src/Makefile b/src/Makefile index ac23acc..64408ed 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,11 +1,11 @@ #Makefile ARCH := $(shell uname -m) # TODO: stb_truetype doesn't compile with some of these warnings. -CXX = g++ -std=gnu++0x -g -Wall -Werror -Wshadow -pedantic +CXX = g++ -std=gnu++0x -g -Wall -Werror -Wshadow -pedantic -rdynamic MAIN = main.o -OBJ = log.o real.o document.o objectrenderer.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 +OBJ = log.o real.o bezier.o document.o objectrenderer.o view.o screen.o vfpu.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o add_digits_asm.o sub_digits_asm.o mul_digits_asm.o div_digits_asm.o arbint.o +LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL -lgmp +LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL -lgmp MAINRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../contrib/lib' MAINRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32' @@ -30,7 +30,7 @@ RM = rm -f BIN = ../bin/ipdf - +all : DEF = -DREAL=1 all : $(BIN) single : DEF = -DREAL=0 @@ -69,10 +69,14 @@ $(BIN) : $(LINKOBJ) ../obj/$(MAIN) -include $(DEPS) -../obj/%.o : %.cpp +../obj/%.o : %.cpp main.h @mkdir -p $(dir $@) $(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $< +../obj/%_asm.o : %_asm.s main.h + @mkdir -p $(dir $@) + $(CXX) -c -o $@ $< + -include $(DEPS) clean_bin :