X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2FMakefile;h=b7489c8d58a2d986cc3669e61e2022f7e45db417;hb=f73ce73b9cec7f1e2c265b3cbcc7bca9c4011d11;hp=c64bebd59ab8006d220332c3c1097b66bc779554;hpb=a54254dcb23c8db9b78d5bd42e1ca54efda4c8e8;p=ipdf%2Fcode.git diff --git a/src/Makefile b/src/Makefile index c64bebd..b7489c8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,7 +19,7 @@ QT_LIB := -L/usr/lib/x86_64-linux-gnu -lQtGui -lQtCore -lpthread LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL -lgmp LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL -lgmp LIB_i686 = $(LIB_i386) -LIB_win32 = -mwindows -lmingw32 -L../contrib/win32/lib/ -lSDL2main -lSDL2 -lgmp -static-libgcc -static-libstdc++ +LIB_win32 = -mwindows -lmingw32 -L../contrib/win32/lib/ -lSDL2main -lSDL2 -lgmp -static-libgcc -lopengl32 -static-libstdc++ MAINRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../contrib/lib' MAINRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../contrib/lib32' @@ -28,6 +28,7 @@ MAINRPATH_win32 = -Wl,-rpath,'$$ORIGIN/../contrib/win32/lib' TESTRPATH_x86_64 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib' TESTRPATH_i386 = -Wl,-rpath,'$$ORIGIN/../../contrib/lib32' TESTRPATH_i686 = $(TESTRPATH_i386) +TESTRPATH_win32 = -Wl,-rpath,'$$ORIGIN/../../contrib/win32/lib' OBJPATHS = $(OBJ:%=../obj/%) DEPS := $(OBJPATHS:%.o=%.d) CFLAGS_x86_64 := -I../contrib/include/SDL2 -I`pwd` @@ -157,7 +158,7 @@ clean_bin : $(RM) $(BIN) clean : - $(RM) $(BIN) $(DEPS) $(LINKOBJ) ../obj/$(MAIN) + $(RM) $(BIN) $(DEPS) $(LINKOBJ) ../obj/$(MAIN) ../obj/quadtree.? $(RM) tests/*~ $(RM) tests/*.test $(RM) tests/*.out