svn commit: r327026 - head/games/windstille/files

Dmitry Marakasov amdmi3 at FreeBSD.org
Thu Sep 12 01:27:26 UTC 2013


Author: amdmi3
Date: Thu Sep 12 01:27:25 2013
New Revision: 327026
URL: http://svnweb.freebsd.org/changeset/ports/327026

Log:
  - Fix build with clang

Added:
  head/games/windstille/files/patch-src-display-surface__manager.cpp   (contents, props changed)
  head/games/windstille/files/patch-src-display-texture__manager.cpp   (contents, props changed)
Modified:
  head/games/windstille/files/patch-src-SConstruct

Modified: head/games/windstille/files/patch-src-SConstruct
==============================================================================
--- head/games/windstille/files/patch-src-SConstruct	Thu Sep 12 01:27:09 2013	(r327025)
+++ head/games/windstille/files/patch-src-SConstruct	Thu Sep 12 01:27:25 2013	(r327026)
@@ -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'])
  

Added: head/games/windstille/files/patch-src-display-surface__manager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/windstille/files/patch-src-display-surface__manager.cpp	Thu Sep 12 01:27:25 2013	(r327026)
@@ -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()
+ {

Added: head/games/windstille/files/patch-src-display-texture__manager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/windstille/files/patch-src-display-texture__manager.cpp	Thu Sep 12 01:27:25 2013	(r327026)
@@ -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()
+ {


More information about the svn-ports-all mailing list