From c7a17eba0f59bfca733f619d732bba3fb276b1da Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Fri, 19 May 2017 02:24:41 -0700 Subject: [PATCH] mingw/msys2 port almost done. glew is still a sticking point --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c03fb83..7ee900b 100644 --- a/Makefile +++ b/Makefile @@ -14,13 +14,14 @@ warn = -pedantic -Wall CFLAGS = $(warn) $(opt) $(dbg) $(incpath) CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath) -LDFLAGS = $(libpath) $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman \ - -lpthread -lassimp -ltreestore -ldrawtext -lgoatvr `pkg-config --libs sdl2` +LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman \ + -lpthread -lassimp -ltreestore -lgoatvr \ + -lz -lpng -ljpeg `pkg-config --libs sdl2 freetype2` sys = $(shell uname -s | sed 's/MINGW.*/mingw/') libgl_Linux = -lGL -lGLU -lGLEW libgl_Darwin = -framework OpenGL -lGLEW -libgl_mingw = -lopengl32 -lglu32 -lglew32 +libgl_mingw = -lopengl32 -lglu32 -lglew32.dll ifeq ($(sys), msys) CFLAGS += -mwin32 -- 1.7.10.4