diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2018-06-22 20:32:35 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2018-06-22 20:32:35 +0000 |
| commit | e52b21d28dec6291e82dd5ae48dd43a0163c172e (patch) | |
| tree | 81c1b7a4a0eacd9b83f99ab0d33e277102c17477 /games/diameter | |
| parent | 80a523280c9ab75da75fa32ba7805c9fc98613ec (diff) | |
| download | ports-e52b21d28dec6291e82dd5ae48dd43a0163c172e.tar.gz ports-e52b21d28dec6291e82dd5ae48dd43a0163c172e.zip | |
- Fix build with clang 6
- Add missing dependency
Notes
Notes:
svn path=/head/; revision=473067
Diffstat (limited to 'games/diameter')
| -rw-r--r-- | games/diameter/Makefile | 7 | ||||
| -rw-r--r-- | games/diameter/files/patch-src_res_3dsloader.cpp | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/games/diameter/Makefile b/games/diameter/Makefile index 668a6b57f0f8..9a8feca52e36 100644 --- a/games/diameter/Makefile +++ b/games/diameter/Makefile @@ -16,9 +16,10 @@ BROKEN_armv7= fails to compile: res/3dsloader.cpp:77:15: comparison between poi LIB_DEPENDS= libpng.so:graphics/png \ libguichan.so:devel/guichan -USES= tar:bzip2 gmake pkgconfig python:2.7 +USES= dos2unix tar:bzip2 gmake pkgconfig python:2.7 +DOS2UNIX_FILES= src/res/3dsloader.cpp GNU_CONFIGURE= yes -USE_GL= gl +USE_GL= gl glu USE_SDL= sdl mixer image WRKSRC= ${WRKDIR}/gamediameter @@ -26,6 +27,8 @@ WRKSRC= ${WRKDIR}/gamediameter CPPFLAGS+= `${SDL_CONFIG} --cflags` -I${LOCALBASE}/include LDFLAGS+= `${SDL_CONFIG} --libs` -L${LOCALBASE}/lib +CXXFLAGS+= -Wno-static-float-init + DATADIR= ${PREFIX}/share/gamediameter PLIST_FILES= bin/${PORTNAME} diff --git a/games/diameter/files/patch-src_res_3dsloader.cpp b/games/diameter/files/patch-src_res_3dsloader.cpp new file mode 100644 index 000000000000..238136ddb164 --- /dev/null +++ b/games/diameter/files/patch-src_res_3dsloader.cpp @@ -0,0 +1,11 @@ +--- src/res/3dsloader.cpp.orig 2008-07-31 11:22:38 UTC ++++ src/res/3dsloader.cpp +@@ -74,7 +74,7 @@ for (i=0; i<MAX_POLYGONS; i++) + struct stat file_status; + #endif + +-if (p_filename=='\0') ++if (p_filename==nullptr || *p_filename=='\0') + return(0); + + if ((l_file=fopen (p_filename, "rb"))== NULL) |