X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;fp=src%2FMakefile;h=04e52feee71847df38a9f4d64c35ca68e8d499d0;hp=c64bebd59ab8006d220332c3c1097b66bc779554;hb=c4f8f7c6c7e43fc9fd5358197ca866b4186f636c;hpb=a9883b166454c794e342ccc262ca97e0394af980 diff --git a/src/Makefile b/src/Makefile index c64bebd..04e52fe 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`