X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2FMakefile;h=30fa7a9a7b44b112d11c3095e7a74449d591d23f;hb=ae6af9f5e166d675a7139ec6dffee4ccab4347bc;hp=38f69fdf7fd456188a91448b44317c8e87e652c5;hpb=77137590512d969da2d54d9ba53d76836a290c6a;p=ipdf%2Fcode.git diff --git a/src/Makefile b/src/Makefile index 38f69fd..30fa7a9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -41,7 +41,7 @@ DEF = -DREALTYPE=$(REALTYPE) ## Only link with things we care about ifeq ($(QUADTREE),enabled) - OBJ := $(OBJ) quadtree.o + OBJ := $(OBJ) else DEF := $(DEF) -DQUADTREE_DISABLED endif @@ -104,7 +104,7 @@ movie : $(BIN) ../tools/stream_plot.py # To change that you can run as `make DEFS="REALTYPE=X" tests/` where X is your chosen type # But remember to make clean first. tests/% : tests/%.cpp ../obj/tests/%.o $(LINKOBJ) - $(CXX) $(CFLAGS) -o $@.test $(LINKOBJ) ../obj/$@.o $(LIB) $(TESTRPATH) + $(CXX) $(CFLAGS) -o $@ $(LINKOBJ) ../obj/$@.o $(LIB) $(TESTRPATH) -include $(DEPS)