From 064a1d83a8fafa062d584c0817cf816f731367ba Mon Sep 17 00:00:00 2001 From: John Tsiombikas Date: Fri, 1 Sep 2017 04:25:59 +0300 Subject: [PATCH] fixed cross-build --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4b65ac3..d3220fc 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ bin = demo dbg = -g incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2` -libpath = -L/usr/local/lib +#libpath = -L/usr/local/lib warn = -pedantic -Wall @@ -16,7 +16,7 @@ CFLAGS = $(warn) $(opt) $(dbg) $(incpath) CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath) LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) -lm -lgmath -lvmath -limago \ -lresman -lpthread -lassimp -ltreestore -lgoatvr \ - -lz -lpng -ljpeg `pkg-config --libs sdl2 freetype2` + `pkg-config --libs sdl2 freetype2` -lpng -ljpeg -lz sys = $(shell uname -s | sed 's/MINGW.*/mingw/') libgl_Linux = -lGL -lGLU -lGLEW @@ -26,6 +26,7 @@ libgl_mingw = -lopengl32 -lglu32 -lglew32 ifeq ($(sys), mingw) bin = demo.exe + LDFLAGS += -lmingw32 -lSDL2main -lSDL2 -lwinmm -mwindows #CFLAGS += -DGLEW_STATIC #CXXFLAGS += -DGLEW_STATIC endif @@ -35,7 +36,7 @@ $(bin): .clang_complete $(obj) .PHONY: cross cross: - $(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ + $(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ sys=mingw .PHONY: instalien instalien: demo.exe -- 1.7.10.4