X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=ec8789ace3a368d5884f65df73a485ec532bbaf7;hp=a26843fa601e6a6281b782b66c175cc9f0a3fbf2;hb=c64ec8fda6d6ad1bb5bdc5f2edd7d1d47c2d2680;hpb=e7e4a7ad5c977ae089bab7081e7931fd5e423cc1 diff --git a/src/Makefile b/src/Makefile index a26843f..ec8789a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,7 +3,7 @@ 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 -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 @@ -73,6 +73,10 @@ $(BIN) : $(LINKOBJ) ../obj/$(MAIN) @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 :