git.ucc.asn.au
/
ipdf
/
code.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Maybe this is more correct. realops likes it.
[ipdf/code.git]
/
src
/
Makefile
diff --git
a/src/Makefile
b/src/Makefile
index
8ff6370
..
ec8789a
100644
(file)
--- 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.
#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
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
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
BIN = ../bin/ipdf
-
+all : DEF = -DREAL=1
all : $(BIN)
single : DEF = -DREAL=0
all : $(BIN)
single : DEF = -DREAL=0
@@
-73,6
+73,10
@@
$(BIN) : $(LINKOBJ) ../obj/$(MAIN)
@mkdir -p $(dir $@)
$(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<
@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 :
-include $(DEPS)
clean_bin :
UCC
git Repository :: git.ucc.asn.au