Commit cefb8da1 authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge from legacy_0.2.8.3 and release_0.2.9

Pipeline #249400185 passed with stages
in 34 minutes and 52 seconds
......@@ -531,7 +531,8 @@ case "$target" in
MATHLIB=""
SYS_GL_LIB=""
SYS_GLU_LIB=""
#LIBS="$LIBS -framework GLU -framework Quicktime -lsmpeg"
test x$build_regular = xfalse || LIBS="$LIBS -framework OpenGL"
dnl -framework GLU -framework Quicktime -lsmpeg"
;;
*-*-aix*)
AC_DEFINE(AIX, 1, [AIX])
......
......@@ -714,6 +714,17 @@ context.deploy_zi: context.deploy_base_zeroinstall result.update_zi ${srcdir}/..
result.deploy_zi: context.deploy_zi deploy_external result.deploy_download
+$(srcdir)/context_to_result.sh $@.dir ./deploy_zeroinstall.sh
echo > $@
context.deploy_itch: context.deploy_base_itch ${srcdir}/../deploy/*_itch.sh upload/$(APPTAR_CLIENT_64) upload/$(APPTAR_CLIENT_32) $(WINZIP_CLIENT)
${srcdir}/prepare_context.sh $@.dir $<.dir/'*' ${srcdir}/../deploy/*_itch.sh
mkdir -p $@.dir/appdir_linux_64; cd $@.dir/appdir_linux_64; tar -xjf ../../upload/$(APPTAR_CLIENT_64)
mkdir -p $@.dir/appdir_linux_32; cd $@.dir/appdir_linux_32; tar -xjf ../../upload/$(APPTAR_CLIENT_32)
mkdir -p $@.dir/appdir_windows; cd $@.dir/appdir_windows; unzip ../../$(WINZIP_CLIENT)
rm -f $@.dir/image
echo "armadeploy_64" > $@.dir/image
echo > $@
result.deploy_itch: context.deploy_itch
+$(srcdir)/context_to_result.sh $@.dir ./deploy_itch.sh
echo > $@
context.deploy_fp: context.deploy_base_flatpak ${srcdir}/../deploy/*_flatpak.sh
${srcdir}/prepare_context.sh $@.dir $<.dir/'*' ${srcdir}/../deploy/*_flatpak.sh
......
......@@ -2,4 +2,4 @@ This is from the 0.2.9 branch of development. Our current releases are derived f
Changes in AppImage Land: Our AppImage files now are signed and support bandwidth-saving updates via [AppImageUpdate](https://github.com/AppImage/AppImageUpdate). They no longer carry their version in the filename because after an update, that would be a lie.
We now support installation via Flatpak for the 64-bit Linux client. Get the stable versions from [Flathub](https://flathub.org/apps/details/org.armagetronad.ArmagetronAdvanced); [our own repository](https://download.armagetronad.org/docs/flatpak/) has those and also carries the usual test builds.
\ No newline at end of file
We now support installation via Flatpak for the 64-bit Linux client. Get the stable versions from [Flathub](https://flathub.org/apps/details/org.armagetronad.ArmagetronAdvanced); [our own repository](https://download.armagetronad.org/docs/flatpak/) has those and also carries the usual test builds.
......@@ -5,6 +5,9 @@
#define MACOSX_VERSION_10_2 1
#endif
/* Define for MacOS version via XCODE */
#define MACOS_XCODE
/* AIX */
/* #undef AIX */
......
......@@ -1519,7 +1519,9 @@ int nSocket::Create( void )
int socktype = socktype_;
#ifndef WIN32
#ifndef MACOSX
socktype |= SOCK_CLOEXEC;
#endif
#endif
// open new socket
......@@ -1533,7 +1535,7 @@ int nSocket::Create( void )
char tos = IPTOS_LOWDELAY;
setsockopt( socket_, IPPROTO_IP, IP_TOS, &tos, sizeof(char) );
#endif
#endif
// unblock it
unsigned long _true = true;
......
......@@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "tMemManager.h"
// include definition for top source directory
#ifndef MACOSX
#ifndef MACOSX_XCODE
#ifdef TOP_SOURCE_DIR
static const char * s_topSourceDir = TOP_SOURCE_DIR;
#else
......@@ -1415,7 +1415,7 @@ static tString st_RelocatePath( tString const & original )
// tries to find the path to the data files, given the location of the executable
static void FindDataPath()
{
#ifndef MACOSX
#ifndef MACOSX_XCODE
#ifdef WIN32
// look for data in the same directory as the executable
if ( TestDataPath(GetParent(st_pathToExecutable.Get(), 1) ) ) return;
......@@ -1432,13 +1432,13 @@ static void FindDataPath()
#ifdef DEBUG_PATH
tERR_MESSAGE("Could not determine path to data files. Using defaults or command line arguments.\n");
#endif
#endif // !MACOSX
#endif // !MACOSX_XCODE
}
// tries to find the path to the configuration files, given the location of the executable
static void FindConfigurationPath()
{
#ifndef MACOSX
#ifndef MACOSX_XCODE
#ifndef WIN32
if ( TestConfigurationPath( st_RelocatePath( tString( AA_SYSCONFDIR ) ) ) ) return;
#endif
......@@ -1447,7 +1447,7 @@ static void FindConfigurationPath()
if ( TestConfigurationPath(st_DataDir + "/config") ) return;
tERR_WARN("Could not determine path to configuration files. Using defaults or command line arguments.\n");
#endif // !MACOSX
#endif // !MACOSX_XCODE
}
// tries to read a direcory type argument from the command line parser; result is written
......@@ -1470,7 +1470,7 @@ private:
void DoInitialize( tCommandLineParser & parser ) override
{
// Puts the data files in the executable's bundle
#ifndef MACOSX
#ifndef MACOSX_XCODE
try
{
st_pathToExecutable.Set( parser.Executable() );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment