From 2603acd3406e5c35c66a2eafe8546f9d01a40918 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Wed, 28 Sep 2011 20:31:59 +0000 Subject: [PATCH] Makefile lines for building with libvpx from Macports on OSX git-svn-id: https://svn.eduke32.com/eduke32@2047 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 52e9eae2d..d04d858e7 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -57,6 +57,17 @@ EBACKTRACEDLL_TARGET= include $(EROOT)/Makefile.shared +ifneq (0,$(USE_LIBVPX)) + ifeq ($(PLATFORM),WINDOWS) + LIBS+= -LWindows/lib + OURCFLAGS+= -IWindows/include + endif + ifeq ($(PLATFORM),DARWIN) + # vpx headers and lib from 'port install libvpx' + LIBS+= -L/opt/local/lib + OURCFLAGS+= -I/opt/local/include + endif +endif ifeq ($(PLATFORM),WINDOWS) OBJ=obj_win @@ -65,10 +76,6 @@ ifeq ($(PLATFORM),WINDOWS) ifeq (0,$(RELEASE)) EBACKTRACEDLL_TARGET=$(EBACKTRACEDLL) endif - ifneq (0,$(USE_LIBVPX)) - LIBS+= -LWindows/lib - OURCFLAGS+= -IWindows/include - endif else ifeq ($(PLATFORM),LINUX) LIBS+= -ldl -pthread