This is an automated email from the git hooks/post-receive script. smcv pushed a commit to annotated tag 1.42d in repository iortcw.
commit b75c9bbf64b01a63d330464171edc1bc627b5298 Author: Donny Springer <[email protected]> Date: Wed Mar 25 21:11:47 2015 -0400 SP: Add ability to use system SDL2 and OpenAL libs on OSX --- SP/Makefile | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/SP/Makefile b/SP/Makefile index 64450ca..35f2754 100644 --- a/SP/Makefile +++ b/SP/Makefile @@ -516,7 +516,13 @@ ifeq ($(PLATFORM),darwin) ifeq ($(USE_OPENAL),1) ifneq ($(USE_OPENAL_DLOPEN),1) - CLIENT_LIBS += -framework OpenAL + ifneq ($(USE_INTERNAL_LIBS),1) + CLIENT_CFLAGS += $(OPENAL_CFLAGS) + CLIENT_LIBS += $(THREAD_LIBS) $(OPENAL_LIBS) + else + CLIENT_LIBS += -framework OpenAL + CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libopenal.dylib + endif endif endif @@ -531,16 +537,22 @@ ifeq ($(PLATFORM),darwin) ifeq ($(USE_LOCAL_HEADERS),1) BASE_CFLAGS += -I$(SDLHDIR)/include + else + BASE_CFLAGS += $(SDL_CFLAGS) endif # We copy sdlmain before ranlib'ing it so that subversion doesn't think # the file has been modified by each build. - LIBSDLMAIN=$(B)/libSDL2main.a - LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDL2main.a - CLIENT_LIBS += -framework IOKit \ - $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib - RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib - CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib $(LIBSDIR)/macosx/libopenal.dylib + ifeq ($(USE_INTERNAL_LIBS),1) + LIBSDLMAIN=$(B)/libSDL2main.a + LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDL2main.a + CLIENT_LIBS += -framework IOKit $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib + RENDERER_LIBS += -framework OpenGL $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib + CLIENT_EXTRA_FILES += $(LIBSDIR)/macosx/libSDL2-2.0.0.dylib + else + CLIENT_LIBS += -framework IOKit $(SDL_LIBS) + RENDERER_LIBS += -framework OpenGL $(SDL_LIBS) + endif OPTIMIZE = $(OPTIMIZEVM) -ffast-math -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
