# This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # 0ad # 0ad/Makefile # 0ad/pkg-descr # 0ad/pkg-plist # 0ad/distinfo # 0ad/files # 0ad/files/patch-build-premake-src-Src-os.h # 0ad/files/patch-build-premake-premake.lua # 0ad/files/patch-source-ps-DllLoader.cpp # 0ad/files/patch-source-network-fsm.h # 0ad/files/patch-build-premake-extern_libs.lua # 0ad/files/patch-source-simulation-Formation.h # 0ad/files/patch-source-simulation-Projectile.h # 0ad/files/patch-source-lib-debug_stl.cpp # 0ad/files/patch-source-lib-file-vfs-vfs_tree.h # 0ad/files/patch-source-lib-sysdep-arch-x86_x64-topology.cpp # 0ad/files/patch-source-lib-sysdep-os-unix-udbg.cpp # 0ad/files/patch-source-lib-sysdep-os-osx-osx.cpp # 0ad/files/patch-source-lib-sysdep-os-osx-odbg.cpp # 0ad/files/patch-source-tools-atlas-AtlasScript-ScriptInterface.cpp # 0ad/files/patch-libraries-fcollada-src-Makefile # 0ad/files/patch-libraries-fcollada-src-FCollada-FUtils-FUStringBuilder.hpp # 0ad/files/patch-build-workspaces-update-workspaces.sh # 0ad/files/patch-libraries-fcollada-src-FCollada-FUtils-FUPluginManager.cpp # echo c - 0ad mkdir -p 0ad > /dev/null 2>&1 echo x - 0ad/Makefile sed 's/^X//' >0ad/Makefile << '07c61848250063334b0f55c16619a7dc' X# New ports collection makefile for: 0ad X# Date created: 13 Jul 2009 X# Whom: Dmitry Marakasov X# X# $FreeBSD$ X# X XPORTNAME= 0ad XDISTVERSION= r6954 XCATEGORIES= games XMASTER_SITES= http://mirror.amdmi3.ru/distfiles/ X XMAINTAINER= amdmi3@FreeBSD.org XCOMMENT= Empty comment X XLIB_DEPENDS= boost_filesystem.4:${PORTSDIR}/devel/boost \ X jpeg.9:${PORTSDIR}/graphics/jpeg \ X js.1:${PORTSDIR}/lang/spidermonkey \ X openal.0:${PORTSDIR}/audio/openal \ X png.5:${PORTSDIR}/graphics/png \ X vorbis.4:${PORTSDIR}/audio/libvorbis XBUILD_DEPENDS= ${LOCALBASE}/lib/libenet.a:${PORTSDIR}/net/enet X XUSE_GMAKE= yes XUSE_SDL= sdl XUSE_GNOME= libxml2 XUSE_GL= gl glu X#USE_WX= 2.8 # needed for atlas, not yet tried to build it X XWRKSRC= ${WRKDIR}/${PORTNAME} X XCONFIGURE_WRKSRC=${WRKSRC}/build/workspaces XBUILD_WRKSRC= ${WRKSRC}/build/workspaces/gcc X X#MAKE_JOBS_UNSAFE= yes # not sure yet X X.include X XMAKE_ENV+= ARCH=${ARCH} X Xpost-patch: X @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; \ X s|sdl-config|${SDL_CONFIG}|; \ X s|wx-config|${WX_CONFIG}|' \ X ${WRKSRC}/build/premake/premake.lua \ X ${WRKSRC}/build/premake/extern_libs.lua X X @${REINPLACE_CMD} -e '/include/ s|js/js|js|' \ X ${WRKSRC}/source/tools/atlas/AtlasScript/ScriptInterface.cpp \ X ${WRKSRC}/source/tools/atlas/AtlasScript/ScriptInterface.h \ X ${WRKSRC}/source/tools/atlas/wxJS/ext/wxjs_ext.h \ X ${WRKSRC}/source/tools/atlas/wxJS/gui/gui_init.cpp \ X ${WRKSRC}/source/tools/atlas/wxJS/gui/gui_main.cpp \ X ${WRKSRC}/source/tools/atlas/wxJS/common/type.h \ X ${WRKSRC}/source/tools/atlas/wxJS/common/main.h \ X ${WRKSRC}/source/tools/atlas/wxJS/common/jsutil.cpp \ X ${WRKSRC}/source/tools/rmgen/stdafx.h \ X ${WRKSRC}/source/tools/rmgen/scripting.h \ X ${WRKSRC}/source/scripting/SpiderMonkey.h X X @${REINPLACE_CMD} -e '/define OS_LINUX/ s|0|1|' \ X ${WRKSRC}/source/lib/sysdep/os.h X X @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \ X ${WRKSRC}/libraries/fcollada/src/FCollada/LibXML/xmlmemory.c \ X ${WRKSRC}/libraries/fcollada/src/FCollada/FUtils/Platforms.h \ X ${WRKSRC}/libraries/fcollada/include/FUtils/Platforms.h X Xpre-configure: X cd ${WRKSRC}/build/premake/src && \ X ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} CONFIG=Release && \ X ${CP} bin/premake .. X cd ${WRKSRC}/libraries/fcollada/src && \ X ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} X Xdo-configure: X cd ${CONFIGURE_WRKSRC} && ${SH} update-workspaces.sh --without-pch X ${FIND} ${CONFIGURE_WRKSRC} -name "*.make" | ${XARGS} \ X ${REINPLACE_CMD} -e 's|\@$$(CXX)|$$(CXX)|; \ X s|linux/lcpu.cpp|osx/ocpu.cpp|; \ X s|linux/linux.cpp|osx/osx.cpp|; \ X s|linux/ldbg.cpp|osx/odbg.cpp|' X Xdo-install: X ${ECHO_MSG} "This is work-in-progress port, and it does" X ${ECHO_MSG} "not support installation yet. You can cd into" X ${ECHO_MSG} "${WRKSRC}/binaries/system" X ${ECHO_MSG} "and run ./pyrogenesis_dbg there to test the" X ${ECHO_MSG} "game. Also please make sure that you have aio" X ${ECHO_MSG} "module loaded (kldload aio)" X ${FALSE} X X.include 07c61848250063334b0f55c16619a7dc echo x - 0ad/pkg-descr sed 's/^X//' >0ad/pkg-descr << '725ae5e49996aac531f6ac24850b58e1' X XWWW: http://0ad.sourceforge.net/ 725ae5e49996aac531f6ac24850b58e1 echo x - 0ad/pkg-plist sed 's/^X//' >0ad/pkg-plist << 'c063f20e22529f5d3edd1257516c3ba3' c063f20e22529f5d3edd1257516c3ba3 echo x - 0ad/distinfo sed 's/^X//' >0ad/distinfo << '743d6e9d0f6fddd974995e7c6a6a2a79' XMD5 (0ad-r6954.tar.gz) = 49b081ae16bc20175ce9d0979e552747 XSHA256 (0ad-r6954.tar.gz) = 97705183b1a4fde58b343025f6df4c8e8bc487effb88b0b2faa338c33c70c1a4 XSIZE (0ad-r6954.tar.gz) = 144962813 743d6e9d0f6fddd974995e7c6a6a2a79 echo c - 0ad/files mkdir -p 0ad/files > /dev/null 2>&1 echo x - 0ad/files/patch-build-premake-src-Src-os.h sed 's/^X//' >0ad/files/patch-build-premake-src-Src-os.h << 'cc92718de21decd0dfc391f5375aa5c1' X--- build/premake/src/Src/os.h.orig 2009-07-13 20:24:18.000000000 +0400 X+++ build/premake/src/Src/os.h 2009-07-13 20:54:33.000000000 +0400 X@@ -19,7 +19,7 @@ X * but since it is the most command I use is as the default */ X #if defined(__linux__) X #define PLATFORM_POSIX 1 X-#elif defined(__FreeBSD) || defined(__NetBSD__) || defined(__OpenBSD__) X+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) X #define PLATFORM_POSIX 1 X #elif defined(__APPLE__) && defined(__MACH__) X #define PLATFORM_POSIX 1 cc92718de21decd0dfc391f5375aa5c1 echo x - 0ad/files/patch-build-premake-premake.lua sed 's/^X//' >0ad/files/patch-build-premake-premake.lua << 'a7089156cdcd6533b4197349d4284471' X--- build/premake/premake.lua.orig 2009-07-13 20:24:18.000000000 +0400 X+++ build/premake/premake.lua 2009-07-13 21:50:02.000000000 +0400 X@@ -17,6 +17,10 @@ X if os.getenv("PROCESSOR_ARCHITECTURE") == "amd64" or os.getenv("PROCESSOR_ARCHITEW6432") == "amd64" then X arch = "amd64" X end X+elseif OS == "bsd" then X+ if os.getenv("ARCH") == "amd64" then X+ arch = "amd64" X+ end X else X if os.getenv("HOSTTYPE") == "x86_64" then X arch = "amd64" X@@ -40,7 +44,7 @@ X has_broken_pch = false X else X project.cxxtestpath = "../../build/bin/cxxtestgen.pl" X- if OS == "linux" and arch == "amd64" then X+ if ( OS == "linux" or OS == "bsd" ) and arch == "amd64" then X -- Hack for amd64 linux - tell nasm to product 64-bit elf. X project.nasmformat = "elf64" X end X@@ -170,6 +174,14 @@ X -- MacPorts uses /opt/local as its prefix X package.includepaths = { "/opt/local/include" } X package.libpaths = { "/opt/local/lib" } X+ elseif OS == "bsd" then X+ package.includepaths = { X+ "/usr/local/include/X11", X+ "/usr/local/include" X+ } X+ package.libpaths = { X+ "/usr/local/lib" X+ } X else X -- X11 includes may be installed in one of a gadzillion of three places X -- Famous last words: "You can't include too much! ;-)" X@@ -472,6 +484,7 @@ X -- note: don't add "lib/sysdep/os/win/aken.cpp" because that must be compiled with the DDK. X windows = { "lib/sysdep/os/win", "lib/sysdep/os/win/wposix", "lib/sysdep/os/win/whrt" }, X macosx = { "lib/sysdep/os/osx", "lib/sysdep/os/unix" }, X+ bsd = { "lib/sysdep/os/linux", "lib/sysdep/os/unix", "lib/sysdep/os/unix/x" }, X } X for i,v in sysdep_dirs[OS] do X tinsert(source_dirs, v); X@@ -835,9 +848,9 @@ X listconcat(package.links, extra_params["extra_links"]) X end X X- elseif OS == "linux" then X+ elseif OS == "linux" or OS == "bsd" then X tinsert(package.defines, "LINUX"); X- tinsert(package.includepaths, "/usr/include/libxml2") X+ tinsert(package.includepaths, "/usr/local/include/libxml2") X tinsert(package.links, "xml2") X X tinsert(package.buildoptions, "-rdynamic") a7089156cdcd6533b4197349d4284471 echo x - 0ad/files/patch-source-ps-DllLoader.cpp sed 's/^X//' >0ad/files/patch-source-ps-DllLoader.cpp << '1a3d0c6025b8bd91a0623557c26d8734' X--- source/ps/DllLoader.cpp.orig 2009-07-13 18:00:43.000000000 +0400 X+++ source/ps/DllLoader.cpp 2009-07-13 21:42:27.000000000 +0400 X@@ -84,7 +84,7 @@ X // open failed (mostly likely SO not found) X if (! m_Handle) X { X- char* error = dlerror(); X+ const char* error = dlerror(); X if (error) X LOG(CLogger::Error, "", "dlopen error: %s", error); X m_Handle = HANDLE_UNAVAILABLE; 1a3d0c6025b8bd91a0623557c26d8734 echo x - 0ad/files/patch-source-network-fsm.h sed 's/^X//' >0ad/files/patch-source-network-fsm.h << '8a3ceb2d4f942751829f4bdc995a190a' X--- source/network/fsm.h.orig 2009-07-13 21:47:51.000000000 +0400 X+++ source/network/fsm.h 2009-07-13 21:48:11.000000000 +0400 X@@ -29,6 +29,7 @@ X // INCLUDES X #include X #include X+#include X X // DECLARATIONS X #define FSM_INVALID_STATE ( unsigned int )( ~0 ) 8a3ceb2d4f942751829f4bdc995a190a echo x - 0ad/files/patch-build-premake-extern_libs.lua sed 's/^X//' >0ad/files/patch-build-premake-extern_libs.lua << '860d799c0e754cd5442ed65890b15c92' X--- build/premake/extern_libs.lua.orig 2009-07-13 17:55:31.000000000 +0400 X+++ build/premake/extern_libs.lua 2009-07-13 22:23:56.000000000 +0400 X@@ -85,7 +85,7 @@ X tinsert(package.config["Testing"].links, "enet_dbg") X tinsert(package.config["Release"].links, "enet") X else X- tinsert(package.includepaths, libraries_dir.."enet/include") X+ tinsert(package.includepaths, "/usr/local/include") X tinsert(package.linkoptions, "-lenet") X end X end, X@@ -118,7 +118,7 @@ X tinsert(package.config["Testing"].links, "libxml2") X tinsert(package.config["Release"].links, "libxml2") X else X- tinsert(package.includepaths, "/usr/include/libxml2") X+ tinsert(package.includepaths, "/usr/local/include/libxml2") X tinsert(package.linkoptions, "-lxml2") X end X end, 860d799c0e754cd5442ed65890b15c92 echo x - 0ad/files/patch-source-simulation-Formation.h sed 's/^X//' >0ad/files/patch-source-simulation-Formation.h << 'c51497dd95cba319e101a2a0a2788e4f' X--- source/simulation/Formation.h.orig 2009-07-13 18:04:00.000000000 +0400 X+++ source/simulation/Formation.h 2009-07-13 21:56:41.000000000 +0400 X@@ -23,6 +23,7 @@ X #include X #include X #include "ps/XML/Xeromyces.h" X+#include "ps/CStr.h" X X class CStr; X c51497dd95cba319e101a2a0a2788e4f echo x - 0ad/files/patch-source-simulation-Projectile.h sed 's/^X//' >0ad/files/patch-source-simulation-Projectile.h << '96c411f835e0e79a14b2dac759381c5e' X--- source/simulation/Projectile.h.orig 2009-07-13 18:04:00.000000000 +0400 X+++ source/simulation/Projectile.h 2009-07-13 21:57:18.000000000 +0400 X@@ -22,6 +22,8 @@ X #ifndef INCLUDED_PROJECTILE X #define INCLUDED_PROJECTILE X X+#include X+ X #include "maths/Vector3D.h" X #include "ps/Vector2D.h" X #include "scripting/ScriptableObject.h" 96c411f835e0e79a14b2dac759381c5e echo x - 0ad/files/patch-source-lib-debug_stl.cpp sed 's/^X//' >0ad/files/patch-source-lib-debug_stl.cpp << '7dad1866a54d9e590ae3aec46ee4b1db' X--- source/lib/debug_stl.cpp.orig 2009-07-13 19:21:25.000000000 +0400 X+++ source/lib/debug_stl.cpp 2009-07-13 22:03:14.000000000 +0400 X@@ -26,6 +26,7 @@ X #include X #include X #include X+#include X X #include "regex.h" X 7dad1866a54d9e590ae3aec46ee4b1db echo x - 0ad/files/patch-source-lib-file-vfs-vfs_tree.h sed 's/^X//' >0ad/files/patch-source-lib-file-vfs-vfs_tree.h << 'e435822faa20851d0df0fc6f812311df' X--- source/lib/file/vfs/vfs_tree.h.orig 2009-07-13 19:22:13.000000000 +0400 X+++ source/lib/file/vfs/vfs_tree.h 2009-07-13 22:04:58.000000000 +0400 X@@ -22,6 +22,8 @@ X #ifndef INCLUDED_VFS_TREE X #define INCLUDED_VFS_TREE X X+#include X+ X #include "lib/file/file_system.h" // FileInfo X #include "lib/file/common/file_loader.h" // PIFileLoader X #include "lib/file/common/real_directory.h" // PRealDirectory e435822faa20851d0df0fc6f812311df echo x - 0ad/files/patch-source-lib-sysdep-arch-x86_x64-topology.cpp sed 's/^X//' >0ad/files/patch-source-lib-sysdep-arch-x86_x64-topology.cpp << 'a469dcc2e06a71f6adb8e49e32b29559' X--- source/lib/sysdep/arch/x86_x64/topology.cpp.orig 2009-07-13 19:23:08.000000000 +0400 X+++ source/lib/sysdep/arch/x86_x64/topology.cpp 2009-07-13 22:06:17.000000000 +0400 X@@ -19,6 +19,8 @@ X * detection of CPU and cache topology X */ X X+#include X+ X #include "precompiled.h" X #include "topology.h" X a469dcc2e06a71f6adb8e49e32b29559 echo x - 0ad/files/patch-source-lib-sysdep-os-unix-udbg.cpp sed 's/^X//' >0ad/files/patch-source-lib-sysdep-os-unix-udbg.cpp << '8c90e9e8f6b78c630131d06420c19e88' X--- source/lib/sysdep/os/unix/udbg.cpp.orig 2009-07-13 19:22:31.000000000 +0400 X+++ source/lib/sysdep/os/unix/udbg.cpp 2009-07-13 22:20:25.000000000 +0400 X@@ -22,6 +22,8 @@ X symbol lookups and backtraces) X */ X X+#include X+ X #include "precompiled.h" X X #include "lib/timer.h" 8c90e9e8f6b78c630131d06420c19e88 echo x - 0ad/files/patch-source-lib-sysdep-os-osx-osx.cpp sed 's/^X//' >0ad/files/patch-source-lib-sysdep-os-osx-osx.cpp << '9db757ae45a5de1b90ac769184ed83e6' X--- source/lib/sysdep/os/osx/osx.cpp.orig 2009-07-13 19:22:35.000000000 +0400 X+++ source/lib/sysdep/os/osx/osx.cpp 2009-07-13 22:50:24.000000000 +0400 X@@ -22,8 +22,6 @@ X #include "lib/sysdep/sysdep.h" X #include "lib/sysdep/gfx.h" X X-#include X- X X // "copy" text into the clipboard. replaces previous contents. X LibError sys_clipboard_set(const wchar_t* text) X@@ -74,32 +72,7 @@ X X LibError sys_get_executable_name(char* n_path, size_t max_chars) X { X- static char name[PATH_MAX]; X- static bool init = false; X- if ( !init ) X- { X- init = true; X- char temp[PATH_MAX]; X- u32 size = PATH_MAX; X- if (_NSGetExecutablePath( temp, &size )) X- { X- return ERR::NO_SYS; X- } X- debug_printf("exe name before realpath: %s\n", temp); X- realpath(temp, name); X- debug_printf("exe name after realpath: %s\n", temp); X- } X- X- // On OS X, we might be in a bundle. In this case set its name as our name. X- char* app = strstr(name, ".app"); X- if (app) { X- // Remove everything after the .app X- *(app + strlen(".app")) = '\0'; X- debug_printf("app bundle name: %s\n", name); X- } X- X- strncpy(n_path, name, max_chars); X- debug_printf("returning exe name: %s\n", name); X+ strncpy(n_path, getprogname(), max_chars); X X return INFO::OK; X } 9db757ae45a5de1b90ac769184ed83e6 echo x - 0ad/files/patch-source-lib-sysdep-os-osx-odbg.cpp sed 's/^X//' >0ad/files/patch-source-lib-sysdep-os-osx-odbg.cpp << '4989354e92c1a5c5ee5eaa7f3630ea71' X--- source/lib/sysdep/os/osx/odbg.cpp.orig 2009-07-13 19:22:35.000000000 +0400 X+++ source/lib/sysdep/os/osx/odbg.cpp 2009-07-13 22:54:59.000000000 +0400 X@@ -28,7 +28,7 @@ X return NULL; X } X X-LibError debug_DumpStack(wchar_t* UNUSED(buf), size_t UNUSED(max_chars), size_t UNUSED(skip), void* UNUSED(context)) X+LibError debug_DumpStack(wchar_t* UNUSED(buf), size_t UNUSED(max_chars), void* UNUSED(skip), const char* UNUSED(context)) X { X return ERR::NOT_IMPLEMENTED; X } 4989354e92c1a5c5ee5eaa7f3630ea71 echo x - 0ad/files/patch-source-tools-atlas-AtlasScript-ScriptInterface.cpp sed 's/^X//' >0ad/files/patch-source-tools-atlas-AtlasScript-ScriptInterface.cpp << '02e56b2851d73bc2d61668ff87f95b9a' X--- source/tools/atlas/AtlasScript/ScriptInterface.cpp.orig 2009-07-13 22:47:04.000000000 +0400 X+++ source/tools/atlas/AtlasScript/ScriptInterface.cpp 2009-07-13 22:58:15.000000000 +0400 X@@ -48,10 +48,6 @@ X #include X #include X X-#ifndef _WIN32 X-# include X-#endif X- X #define FAIL(msg) do { JS_ReportError(cx, msg); return false; } while (false) X X const int RUNTIME_SIZE = 4*1024*1024; // TODO: how much memory is needed? X@@ -513,10 +509,6 @@ X wxLogWarning(_T("%s"), logMessage.c_str()); X else X wxLogError(_T("%s"), logMessage.c_str()); X-#ifndef _WIN32 X- // When running under Valgrind, print more information in the error message X- VALGRIND_PRINTF_BACKTRACE("->"); X-#endif X wxPrintf(_T("wxJS %s: %s\n--------\n"), isWarning ? _T("warning") : _T("error"), logMessage.c_str()); X } X 02e56b2851d73bc2d61668ff87f95b9a echo x - 0ad/files/patch-libraries-fcollada-src-Makefile sed 's/^X//' >0ad/files/patch-libraries-fcollada-src-Makefile << '15dbdf52e5cd559ca1c0077c5d460b88' X--- libraries/fcollada/src/Makefile.orig 2009-07-13 20:24:18.000000000 +0400 X+++ libraries/fcollada/src/Makefile 2009-07-14 04:52:17.000000000 +0400 X@@ -1,9 +1,9 @@ X-CXX := g++ X-CXXFLAGS := -W -Wall -Wno-unused-parameter -Wno-unused-function -DLINUX -fpic X+CXX ?= g++ X+CXXFLAGS += -W -Wall -Wno-unused-parameter -Wno-unused-function -DLINUX -fpic X CXXFLAGS_DEBUG := -O0 -g -D_DEBUG X CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL X LDFLAGS := -lxml2 -shared -fpic X-INCLUDES := -IFCollada -I/usr/include/libxml2 X+INCLUDES += -IFCollada -I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include X X SOURCE = \ X FCollada/FCollada.cpp \ X@@ -185,7 +185,7 @@ X all: output_dirs output/libFColladaSD.a output/libFColladaSR.a install X X output_dirs: X- bash -c 'mkdir -p output/{debug,release}/{FCollada/{FCDocument,FMath,FUtils},FColladaPlugins/FArchiveXML}' X+ csh -c 'mkdir -p output/{debug,release}/{FCollada/{FCDocument,FMath,FUtils},FColladaPlugins/FArchiveXML}' X X output/libFColladaSD.a: $(OBJECTS_DEBUG) X ar -cr $@ $(OBJECTS_DEBUG); ranlib $@ 15dbdf52e5cd559ca1c0077c5d460b88 echo x - 0ad/files/patch-libraries-fcollada-src-FCollada-FUtils-FUStringBuilder.hpp sed 's/^X//' >0ad/files/patch-libraries-fcollada-src-FCollada-FUtils-FUStringBuilder.hpp << '3987e14113391b8281c59c8e5ecfdcd5' X--- libraries/fcollada/src/FCollada/FUtils/FUStringBuilder.hpp.orig 2009-07-13 20:24:18.000000000 +0400 X+++ libraries/fcollada/src/FCollada/FUtils/FUStringBuilder.hpp 2009-07-14 04:56:49.000000000 +0400 X@@ -29,6 +29,14 @@ X template X void FloatToString(FloatType f, Char* sz) X { X+ /* ugly hack */ X+ char buffer[32]; X+ snprintf(sz, 32, "%6f", f); X+ char *from = buffer; X+ Char *to = sz+1; X+ X+ while (((*to++) = (*from++)) != '\0') { /* empty */ } X+/* X Char* buffer = sz + 1; X static const int digitCount = 6; X int decimal, sign; X@@ -81,6 +89,7 @@ X if (decimal == 0 && count == 0) (*buffer++) = '0'; X if (buffer[-1] == '.') --buffer; X (*buffer) = 0; X+ */ X } X X template 3987e14113391b8281c59c8e5ecfdcd5 echo x - 0ad/files/patch-build-workspaces-update-workspaces.sh sed 's/^X//' >0ad/files/patch-build-workspaces-update-workspaces.sh << '07132e235a804fc81caaa9599f8934e5' X--- build/workspaces/update-workspaces.sh.orig 2009-07-13 20:24:18.000000000 +0400 X+++ build/workspaces/update-workspaces.sh 2009-07-14 21:42:50.000000000 +0400 X@@ -11,7 +11,7 @@ X X # build/premake/ X X-HOSTTYPE=$HOSTTYPE ./premake --outpath $workspace_dir --atlas --collada $* --target gnu X+HOSTTYPE=$HOSTTYPE ./premake --outpath $workspace_dir --collada $* --target gnu X X # These files need to be linked; premake makefiles assume that the X # lua file is accessible from the makefile directory 07132e235a804fc81caaa9599f8934e5 echo x - 0ad/files/patch-libraries-fcollada-src-FCollada-FUtils-FUPluginManager.cpp sed 's/^X//' >0ad/files/patch-libraries-fcollada-src-FCollada-FUtils-FUPluginManager.cpp << '09d5d13d5b8bea60a730602fa5cbd3ce' X--- libraries/fcollada/src/FCollada/FUtils/FUPluginManager.cpp.orig 2009-07-13 18:23:52.000000000 +0400 X+++ libraries/fcollada/src/FCollada/FUtils/FUPluginManager.cpp 2009-07-15 04:58:04.000000000 +0400 X@@ -42,7 +42,10 @@ X FUPluginManager::FUPluginManager(const fchar* _filter) X { X fstring applicationFolderName = FUFileManager::GetApplicationFolderName(); X- LoadPluginsInFolderName(applicationFolderName, _filter); X+ if (!applicationFolderName.empty()) X+ { X+ LoadPluginsInFolderName(applicationFolderName, _filter); X+ } X X fstring moduleFolderName = FUFileManager::GetModuleFolderName(); X if (!moduleFolderName.empty() && !IsEquivalent(moduleFolderName, applicationFolderName)) 09d5d13d5b8bea60a730602fa5cbd3ce exit