diff options
| author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2012-03-31 20:51:40 +0000 |
|---|---|---|
| committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2012-03-31 20:51:40 +0000 |
| commit | 3212089089bd6bb3349cc9027aa175ffa9056aac (patch) | |
| tree | 07d6a9fbc99336b9f2f3648a9c17964f61386a3e /x11-toolkits | |
| parent | - Fix build with bzip2 support (diff) | |
- Fix build with png and jepg support. They were not detected correctly and it
could cause problems with apps that depends of Irrlicht
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=294055
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/irrlicht/Makefile | 10 | ||||
| -rw-r--r-- | x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile index 0903352a0761..0f5038543f70 100644 --- a/x11-toolkits/irrlicht/Makefile +++ b/x11-toolkits/irrlicht/Makefile @@ -27,11 +27,6 @@ PLIST_SUB+= SHARED_LIB_VER=${SHARED_LIB_VER} SUB_FILES= pkg-message BUILD_WRKSRC= ${WRKSRC}/source/Irrlicht -CPPFLAGS+= -DNO_IRR_USE_NON_SYSTEM_JPEG_LIB_ \ - -DNO_IRR_USE_NON_SYSTEM_LIB_PNG_ \ - -DNO_IRR_USE_NON_SYSTEM_ZLIB_ \ - -DNO_IRR_COMPILE_WITH_BZIP2_ - SHARED_LIB_VER= 1 EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserInterface \ 06.2DGraphics 07.Collision 08.SpecialFX 09.Meshviewer 10.Shaders \ @@ -73,6 +68,11 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ ${WRKSRC}/source/Irrlicht/CImageLoaderPNG.cpp + @${REINPLACE_CMD} -e '/#define.*_IRR_USE_NON_SYSTEM_JPEG_LIB_/ d' \ + -e '/#define.*_IRR_USE_NON_SYSTEM_LIB_PNG_/ d' \ + -e '/#define.*_IRR_USE_NON_SYSTEM_ZLIB_/ d' \ + -e '/#define.*_IRR_USE_NON_SYSTEM_BZLIB_/ d' \ + ${WRKSRC}/include/IrrCompileConfig.h .if !defined(HAVE_JOYSTICK) @${REINPLACE_CMD} -e '/define.*_IRR_COMPILE_WITH_JOYSTICK_EVENTS_/ d' \ ${WRKSRC}/include/IrrCompileConfig.h diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile index e6a2e49c0706..fafa3fb438fc 100644 --- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile @@ -23,7 +23,7 @@ $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \ - $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \ - $(BZIP2OBJ) $(EXTRAOBJ) -+ $(IRRGUIOBJ) $(ZLIBOBJ) $(LIBAESGM) $(EXTRAOBJ) ++ $(IRRGUIOBJ) $(LIBAESGM) $(EXTRAOBJ) ############### #Compiler flags |