X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=ec8789ace3a368d5884f65df73a485ec532bbaf7;hp=6dbb2e13d5533cac420c47034fdf6e880895c716;hb=e297312c8c82e52abd3507c861e85db497ca7e81;hpb=f59f24dff392428d7219ba2d6be5e1e81c344ee0 diff --git a/src/Makefile b/src/Makefile index 6dbb2e1..ec8789a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,9 +1,9 @@ #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 bezier.o document.o objectrenderer.o view.o screen.o vfpu.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o +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 LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL @@ -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 :