aboutsummaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2013-09-12 09:27:25 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2013-09-12 09:27:25 +0800
commitc6a220be611c01549499b6d073af317e6f0d5521 (patch)
tree5e96f34e4818d2df5c847e0212eece0d645b31da /games
parent1175fb527fcb925899b4b1553bab7b91cd0a4f0f (diff)
downloadfreebsd-ports-gnome-c6a220be611c01549499b6d073af317e6f0d5521.tar.gz
freebsd-ports-gnome-c6a220be611c01549499b6d073af317e6f0d5521.tar.zst
freebsd-ports-gnome-c6a220be611c01549499b6d073af317e6f0d5521.zip
- Fix build with clang
Diffstat (limited to 'games')
-rw-r--r--games/windstille/files/patch-src-SConstruct2
-rw-r--r--games/windstille/files/patch-src-display-surface__manager.cpp14
-rw-r--r--games/windstille/files/patch-src-display-texture__manager.cpp11
3 files changed, 26 insertions, 1 deletions
diff --git a/games/windstille/files/patch-src-SConstruct b/games/windstille/files/patch-src-SConstruct
index 0a0e942aeafd..9bf34e0fe32c 100644
--- a/games/windstille/files/patch-src-SConstruct
+++ b/games/windstille/files/patch-src-SConstruct
@@ -10,7 +10,7 @@
-
-env.Append(CXXFLAGS = conf_env['CXXFLAGS'])
+env = conf_env.Copy()
-+env.Append(LIBS = ['GL', 'GLU', 'squirrel', 'physfs', 'SDL_image', 'openal', 'glew', 'ogg', 'vorbis', 'vorbisfile', 'png'])
++env.Append(LIBS = ['GL', 'GLU', 'squirrel', 'physfs', 'SDL_image', 'openal', 'glew', 'ogg', 'vorbis', 'vorbisfile', 'png', 'iconv'])
+env.Append(LIBPATH = ['../lib/'] )
+env.Append(CPPPATH = ['.', '..', '../lib/SQUIRREL2/include/', '../lib/glew'])
diff --git a/games/windstille/files/patch-src-display-surface__manager.cpp b/games/windstille/files/patch-src-display-surface__manager.cpp
new file mode 100644
index 000000000000..0f098a0b6d10
--- /dev/null
+++ b/games/windstille/files/patch-src-display-surface__manager.cpp
@@ -0,0 +1,14 @@
+--- src/display/surface_manager.cpp.orig 2006-04-25 08:08:56.000000000 +0400
++++ src/display/surface_manager.cpp 2013-09-12 04:51:36.056226058 +0400
+@@ -13,9 +13,10 @@
+ #include "texture.hpp"
+ #include "surface.hpp"
+ #include "texture_manager.hpp"
++
+ #include "physfs/physfs_sdl.hpp"
+
+-SurfaceManager::SurfaceManager* surface_manager = 0;
++SurfaceManager* surface_manager = 0;
+
+ SurfaceManager::SurfaceManager()
+ {
diff --git a/games/windstille/files/patch-src-display-texture__manager.cpp b/games/windstille/files/patch-src-display-texture__manager.cpp
new file mode 100644
index 000000000000..0f82c2074c91
--- /dev/null
+++ b/games/windstille/files/patch-src-display-texture__manager.cpp
@@ -0,0 +1,11 @@
+--- src/display/texture_manager.cpp.orig 2006-03-11 16:50:05.000000000 +0300
++++ src/display/texture_manager.cpp 2013-09-12 04:43:09.595227271 +0400
+@@ -13,7 +13,7 @@
+ #include "texture.hpp"
+ #include "physfs/physfs_sdl.hpp"
+
+-TextureManager::TextureManager* texture_manager = 0;
++TextureManager* texture_manager = 0;
+
+ TextureManager::TextureManager()
+ {