aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2019-03-11 20:18:13 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2019-03-11 20:18:13 +0000
commit6e31e8d4b4f67a21003b77e16b2d0aeee23fda2f (patch)
treedf5b143dabb8228a16a227c8643867872204095f
parentbe8e7ceb180d3f35c8bd3c027e32c25c048d412c (diff)
downloadports-6e31e8d4b4f67a21003b77e16b2d0aeee23fda2f.tar.gz
ports-6e31e8d4b4f67a21003b77e16b2d0aeee23fda2f.zip
Notes
-rw-r--r--games/widelands/Makefile8
-rw-r--r--games/widelands/files/patch-CMakeLists.txt11
2 files changed, 13 insertions, 6 deletions
diff --git a/games/widelands/Makefile b/games/widelands/Makefile
index c68d38a283ad..f28de85c2b7c 100644
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS= libpng.so:graphics/png \
libicuuc.so:devel/icu \
libboost_regex.so:devel/boost-libs
-USES= cmake compiler:c++11-lib gettext \
- tar:bzip2 python:build
+USES= cmake compiler:c++11-lib gettext gl \
+ tar:bzip2 python:build sdl
CMAKE_ARGS= -DWL_INSTALL_BASEDIR="${PREFIX}" \
-DWL_INSTALL_DATADIR="${DATADIR}" \
-DWL_INSTALL_DOCDIR="${DOCSDIR}" \
@@ -28,10 +28,6 @@ CMAKE_ARGS= -DWL_INSTALL_BASEDIR="${PREFIX}" \
-DWL_OPTIMIZE_FLAGS=""
USE_GL= gl glew
USE_SDL= sdl2 mixer2 image2 net2 ttf2
-CXXFLAGS_powerpc= -Wno-maybe-uninitialized
-CXXFLAGS_powerpcspe= -Wno-maybe-uninitialized
-CXXFLAGS_powerpc64= -Wno-maybe-uninitialized
-CXXFLAGS_sparc64= -Wno-maybe-uninitialized
PORTDATA= *
PORTDOCS= *
diff --git a/games/widelands/files/patch-CMakeLists.txt b/games/widelands/files/patch-CMakeLists.txt
index 6465deda7e62..38696f592eba 100644
--- a/games/widelands/files/patch-CMakeLists.txt
+++ b/games/widelands/files/patch-CMakeLists.txt
@@ -9,6 +9,17 @@
set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
set(WL_OPTIMIZE_FLAGS "-O3")
+@@ -179,8 +179,8 @@ endif()
+ # Turn some warnings into errors.
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
+-wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
+-wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
++wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wshadow")
++wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wuninitialized")
+
+ IF (WIN32)
+ add_definitions(-DMINGW_HAS_SECURE_API)
@@ -225,7 +225,7 @@ if (NOT DEFINED WL_VERSION)
else (NOT DEFINED WL_VERSION)
add_custom_target (