Commit 5d316e99 authored by Manuel Moos's avatar Manuel Moos
Browse files

Merge from release_0.2.8.3

parents 8892b913 7f389850
Pipeline #249393459 passed with stages
in 27 minutes and 2 seconds
......@@ -487,7 +487,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])
......
......@@ -5,6 +5,9 @@
#define MACOSX_VERSION_10_2 1
#endif
/* Define for MacOS version via XCODE */
#define MACOS_XCODE
/* AIX */
/* #undef AIX */
......
......@@ -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
......@@ -1410,7 +1410,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;
......@@ -1427,13 +1427,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
......@@ -1442,7 +1442,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
......@@ -1465,7 +1465,7 @@ private:
virtual void DoInitialize( tCommandLineParser & parser )
{
// 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