From owner-svn-ports-head@FreeBSD.ORG Thu Sep 12 01:27:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9160C601; Thu, 12 Sep 2013 01:27:26 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 66BFA2562; Thu, 12 Sep 2013 01:27:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8C1RQhm002680; Thu, 12 Sep 2013 01:27:26 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8C1RPoH002674; Thu, 12 Sep 2013 01:27:25 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201309120127.r8C1RPoH002674@svn.freebsd.org> From: Dmitry Marakasov Date: Thu, 12 Sep 2013 01:27:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327026 - head/games/windstille/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2013 01:27:26 -0000 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() + {