diff options
| author | John Marino <marino@FreeBSD.org> | 2014-11-02 18:15:19 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-11-02 18:15:19 +0000 |
| commit | 3f64da6c210c20dfc83c709e7a0d0cdcaae3cf88 (patch) | |
| tree | a3bd8f73223c7d44f89e0807cef39d7a0b25cc60 /x11-toolkits | |
| parent | ec60b78154a3a3934e7c5f22c2d23a91d099d6d5 (diff) | |
| download | ports-3f64da6c210c20dfc83c709e7a0d0cdcaae3cf88.tar.gz ports-3f64da6c210c20dfc83c709e7a0d0cdcaae3cf88.zip | |
x11-toolkits/irrlicht: Fix DEBUG option, missing linker symbols
* apply NDEBUG=1 when DEBUG is off
* Depend on libGL instead of libGLU
* Add missing -lX11 -lZ to LDFLAGS
* Add USE_XORG= x11 xxf86vm
PR: 194565
Submitted by: Andriy Voskoboinyk
Notes
Notes:
svn path=/head/; revision=372081
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/irrlicht/Makefile | 6 | ||||
| -rw-r--r-- | x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile index 441813486a98..fe5f7be97648 100644 --- a/x11-toolkits/irrlicht/Makefile +++ b/x11-toolkits/irrlicht/Makefile @@ -3,6 +3,7 @@ PORTNAME= irrlicht PORTVERSION= 1.8.1 +PORTREVISION= 1 CATEGORIES= x11-toolkits graphics MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/${PORTVERSION:R}/${PORTVERSION}/ @@ -17,7 +18,8 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ DOS2UNIX_GLOB= Makefile *.cpp *.h *.txt USES= alias dos2unix gmake zip -USE_GL= yes +USE_GL= gl +USE_XORG= x11 xxf86vm USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include/libpng15 MAKE_ENV+= SHLIB_VER=${SHARED_LIB_VER} @@ -34,7 +36,7 @@ EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserIn OPTIONS_DEFINE= DEBUG EXAMPLES -DEBUG_MAKE_ENV= NDEBUG=1 +DEBUG_MAKE_ENV_OFF= NDEBUG=1 BROKEN_sparc64= Does not compile diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile index d81a6bae15fc..ab1fdcd1c430 100644 --- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile @@ -48,7 +48,7 @@ sharedlib install: SHARED_LIB = libIrrlicht.so -sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -staticlib sharedlib: CXXINCS += -I/usr/X11R6/include -+sharedlib: LDFLAGS += -L${LOCALBASE}/lib -lGL -lXxf86vm -lpng -ljpeg -lbz2 ++sharedlib: LDFLAGS += -L${LOCALBASE}/lib -lGL -lXxf86vm -lX11 -lpng -ljpeg -lbz2 -lz +staticlib sharedlib: CXXINCS += -I${LOCALBASE}/include #OSX specific options |