X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=vrfileman;a=blobdiff_plain;f=Makefile;h=274986deda5284b03f6962ce18bcf2361febde32;hp=5d666acb1c5e08f36cc7b6f84b1e039f2841718c;hb=4e86dbc3eddad9da0b11ecb1b68d68db7b88c57e;hpb=6b808da85d32714e2587823e18e76d45039d628d diff --git a/Makefile b/Makefile index 5d666ac..274986d 100644 --- a/Makefile +++ b/Makefile @@ -5,17 +5,20 @@ dbg = -g # ----------------- src = $(wildcard src/*.cc) -obj = $(src:.cc=.o) +csrc = $(wildcard src/*.c) +obj = $(src:.cc=.o) $(csrc:.c=.o) dep = $(obj:.o=.d) bin = vrfileman warn = -pedantic -Wall -CXXFLAGS = $(warn) $(opt) $(dbg) $(inc) `pkg-config --cflags sdl2` -LDFLAGS = $(libgl) -lgmath `pkg-config --libs sdl2` +CFLAGS = $(warn) $(opt) $(dbg) $(inc) `pkg-config --cflags sdl2` +CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(inc) `pkg-config --cflags sdl2` +LDFLAGS = $(libgl) -lgmath -limago -lgoatvr -loptcfg -ldrawtext `pkg-config --libs sdl2` ifeq ($(shell uname -s), Darwin) + inc += -I/usr/local/include libgl = -framework OpenGL -lGLEW else libgl = -lGL -lGLEW