commit 4c3a3f99d0732987422ea02f58030fb33310a75a parent c5622de42146bad61496edef43718594a163c14e Author: Kyle Milz <kyle@getaddrinfo.net> Date: Tue, 29 Mar 2016 21:03:11 -0600 abstract away using the core osx frameworks for the viewer Diffstat:
| M | Jamrules | | | 15 | ++++++++------- |
| M | viewer/Jamfile | | | 4 | +++- |
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Jamrules b/Jamrules @@ -2,22 +2,23 @@ if $(OS) = OPENBSD { C++ = eg++ ; + SHLIB_SUF = so.0.0 ; + PKG_CONFIG_LIBS = gl glew freetype2 ; # Link directly against libestdc++ from ports - LINKLIBS on scv_viewer = `pkg-config gl glew freetype2 --libs` ; - LINKLIBS on scv_viewer += -lestdc++ -lm -lglut ; + LINKLIBS on scv_viewer = -lestdc++ -lm -lglut ; - SHLIB_SUF = so.0.0 ; } if $(OS) = MACOSX { - LINKLIBS on scv_viewer = `pkg-config glew freetype2 --libs` ; - LINKLIBS on scv_viewer += -framework OpenGL -framework GLUT ; - LINKLIBS on scv_viewer += -lc++ -lm ; + SHLIB_SUF = 0.dylib ; C++FLAGS = -Wno-deprecated ; - SHLIB_SUF = 0.dylib ; + PKG_CONFIG_LIBS = glew freetype2 ; + LINKLIBS on scv_viewer = -framework OpenGL -framework GLUT ; + LINKLIBS on scv_viewer += -lc++ -lm ; + # We must specify that _scv_node0 will be available at runtime LINKFLAGS on libscv.$(SHLIB_SUF) = -Wl,-U,__scv_node0 ; } diff --git a/viewer/Jamfile b/viewer/Jamfile @@ -1,9 +1,11 @@ SubDir TOP viewer ; -SUBDIRC++FLAGS = `pkg-config gl glew freetype2 --cflags` ; +SUBDIRC++FLAGS = `pkg-config $(PKG_CONFIG_LIBS) --cflags` ; SUBDIRC++FLAGS += -I/usr/local/include ; SUBDIRC++FLAGS += -std=c++11 ; +LINKLIBS on scv_viewer += `pkg-config $(PKG_CONFIG_LIBS) --libs` ; + Main scv_viewer : main.cc runtime_process.cc