diff options
Diffstat (limited to 'games/galaxyhack/files')
-rw-r--r-- | games/galaxyhack/files/galaxyhack-sh.in | 20 | ||||
-rw-r--r-- | games/galaxyhack/files/patch-JSDL.cpp | 10 | ||||
-rw-r--r-- | games/galaxyhack/files/patch-Makefile | 19 | ||||
-rw-r--r-- | games/galaxyhack/files/patch-SetupBattle.cpp | 11 | ||||
-rw-r--r-- | games/galaxyhack/files/patch-boost-1.52 | 77 |
5 files changed, 0 insertions, 137 deletions
diff --git a/games/galaxyhack/files/galaxyhack-sh.in b/games/galaxyhack/files/galaxyhack-sh.in deleted file mode 100644 index 930b2551a4ab..000000000000 --- a/games/galaxyhack/files/galaxyhack-sh.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# The executable needs to be run from its data directory, and needs to store -# configuration in it. We therefore mirror the data directory hierarchy in -# ~/.galaxyhack, and create symlinks to the data files, but the configuration -# file is copied, and write permission for the user is added to it. - -if [ -d ~/.galaxyhack ] -then - echo "Using existing ~/.galaxyhack directory." -else - echo "Creating ~/.galaxyhack directory." - cd %%DATADIR%% || exit 1 - find * -type d -exec mkdir -p ~/.galaxyhack/{} \; - cp settings.dat ~/.galaxyhack && chmod u+w ~/.galaxyhack/settings.dat - find * -type f -exec ln -s %%DATADIR%%/{} ~/.galaxyhack/{} \; 2>/dev/null -fi - -cd ~/.galaxyhack || exit 1 -exec %%PREFIX%%/libexec/galaxyhack "$@" diff --git a/games/galaxyhack/files/patch-JSDL.cpp b/games/galaxyhack/files/patch-JSDL.cpp deleted file mode 100644 index bacd8c758b04..000000000000 --- a/games/galaxyhack/files/patch-JSDL.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- JSDL.cpp.orig 2015-09-20 01:08:54 UTC -+++ JSDL.cpp -@@ -18,6 +18,7 @@ - #include <SDL_mixer.h> - - #include <cstdlib> -+#include <cstring> - #include <fstream> - #include <stdexcept> - diff --git a/games/galaxyhack/files/patch-Makefile b/games/galaxyhack/files/patch-Makefile deleted file mode 100644 index ef26385d8848..000000000000 --- a/games/galaxyhack/files/patch-Makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.orig Wed Oct 4 22:32:43 2006 -+++ Makefile Wed Oct 4 22:34:18 2006 -@@ -9,9 +9,13 @@ - INSTALL_DIR=/usr/local/share - INSTALL_BIN_DIR=/usr/local/bin - --CXX = g++ --CXXFLAGS = $(shell sdl-config --cflags) -O3 --LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem -+CXX ?= g++ -+CXXFLAGS += $(shell $(SDL_CONFIG) --cflags) -+LDFLAGS += $(shell $(SDL_CONFIG) --libs) -lSDL_image -lSDL_mixer -lboost_filesystem -lboost_system -+ -+ifdef OPTIMIZED_CFLAGS -+CXXFLAGS += -O3 -+endif - - OBJS = AIInterpreter.o AutoFireUnit.o BCCompiler.o DerivedGroups.o DragWindow.o \ - ForceSelect.o ForceSelectWin.o GenWindow.o GenWindow_Base.o GFX.o Globals.o \ diff --git a/games/galaxyhack/files/patch-SetupBattle.cpp b/games/galaxyhack/files/patch-SetupBattle.cpp deleted file mode 100644 index 355a2c7bc048..000000000000 --- a/games/galaxyhack/files/patch-SetupBattle.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- SetupBattle.cpp.orig Fri Jul 6 01:44:52 2007 -+++ SetupBattle.cpp Fri Jul 6 01:52:29 2007 -@@ -18,7 +18,7 @@ - #include "PreBattle.h" - - #include <sstream> --#include <boost/filesystem/exception.hpp> -+#include <boost/filesystem.hpp> - - using std::stringstream; - using std::getline; diff --git a/games/galaxyhack/files/patch-boost-1.52 b/games/galaxyhack/files/patch-boost-1.52 deleted file mode 100644 index ac824e4efbcf..000000000000 --- a/games/galaxyhack/files/patch-boost-1.52 +++ /dev/null @@ -1,77 +0,0 @@ ---- ForceSelectWin.cpp.orig 2012-08-20 17:35:01.000000000 +0200 -+++ ForceSelectWin.cpp 2012-08-20 17:47:19.000000000 +0200 -@@ -1596,15 +1596,15 @@ - fs::directory_iterator directoryEnd; // default construction yields past-the-end - for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) { - if (is_directory(*iter)) { -- fs::create_directory(destPath.string() + "/" + iter->leaf()); -- DoCopy(sourcePath.string() + "/" + iter->leaf(), destPath.string() + "/" + iter->leaf()); -+ fs::create_directory(destPath.string() + "/" + iter->path().filename().string()); -+ DoCopy(sourcePath.string() + "/" + iter->path().filename().string(), destPath.string() + "/" + iter->path().filename().string()); - continue; - } - string destFile; -- if (iter->leaf() == sideName + ".dat") -+ if (iter->path().filename() == sideName + ".dat") - destFile = theInput + ".dat"; - else -- destFile = iter->leaf(); -+ destFile = iter->path().filename().string(); - - fs::copy_file(*iter, destPath.string() + "/" + destFile); - } ---- Main.cpp.orig 2012-08-20 17:48:13.000000000 +0200 -+++ Main.cpp 2012-08-20 17:50:51.000000000 +0200 -@@ -339,12 +339,6 @@ - - void GameInit(char* argv[]) { - namespace fs = boost::filesystem; -- //boost is really quite stupid -- #ifndef WIN32 -- fs::path::default_name_check(fs::windows_name); -- #else -- fs::path::default_name_check(fs::native); -- #endif - - FindHomePath(); - LoadSettings(argv); ---- Menu_Base.cpp.orig 2012-08-20 17:51:05.000000000 +0200 -+++ Menu_Base.cpp 2012-08-20 17:52:15.000000000 +0200 -@@ -206,7 +206,7 @@ - - fs::directory_iterator directoryEnd; // default construction yields past-the-end - for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) { -- string filename = iter->leaf(); -+ string filename = iter->path().filename().string(); - - if (filename.find('.') == filename.npos) - continue; -@@ -237,7 +237,7 @@ - fs::directory_iterator directoryEnd; // default construction yields past-the-end - for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) { - if (fs::is_directory(*iter)) { -- string fleetName = iter->leaf(); -+ string fleetName = iter->path().filename().string(); - - if (CheckFleetExists(fleetName)) { - tempItem.desc = fleetName; -@@ -261,7 +261,7 @@ - fs::path iterPath(GetFleetDir(whichSide)); - fs::directory_iterator directoryEnd; // default construction yields past-the-end - for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) { -- string filename = iter->leaf(); -+ string filename = iter->path().filename().string(); - - if (filename.find('.') == filename.npos) - continue; ---- Stuff.cpp.orig 2012-08-20 17:52:36.000000000 +0200 -+++ Stuff.cpp 2012-08-20 17:53:11.000000000 +0200 -@@ -657,7 +657,7 @@ - fs::directory_iterator directoryEnd; // default construction yields past-the-end - for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) { - if (fs::is_directory(*iter) && !fs::is_empty(*iter)) -- RemoveDirectory(iter->string()); -+ RemoveDirectory(iter->path().string()); - else - fs::remove(*iter); - } |