mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 10:40:46 +00:00
Three Mac patches from rhoenie:
-sdlayer: Apple and GTK are not mutually exclusive. -Makefile.common: Specify WITHOUT_GTK?=1 by default. -Makefile: Limit linking with the QuickTime framework to OS X 10.6 and below. One fix from me: -osxbuild.sh: Fix building tools. git-svn-id: https://svn.eduke32.com/eduke32@4548 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
68b56adbe2
commit
61f31c36ad
4 changed files with 18 additions and 10 deletions
|
@ -285,8 +285,10 @@ ifeq ($(PLATFORM),DARWIN)
|
|||
LIBS += -lFLAC -lvorbisfile -lvorbis -logg -lm \
|
||||
-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,OpenGL \
|
||||
-Wl,-framework,CoreMidi -Wl,-framework,AudioUnit \
|
||||
-Wl,-framework,AudioToolbox -Wl,-framework,IOKit -Wl,-framework,AGL \
|
||||
-Wl,-framework,QuickTime -lm
|
||||
-Wl,-framework,AudioToolbox -Wl,-framework,IOKit -Wl,-framework,AGL
|
||||
ifneq (00,$(DARWIN9)$(DARWIN10))
|
||||
LIBS += -Wl,-framework,QuickTime -lm
|
||||
endif
|
||||
|
||||
ifneq (0,$(OSX_STARTUPWINDOW))
|
||||
DUKE3D_OBJS += GrpFile.game GameListSource.game startosx.game
|
||||
|
|
|
@ -655,6 +655,7 @@ ifeq ($(PLATFORM),DARWIN)
|
|||
COMPILERFLAGS += -DHAVE_INTTYPES
|
||||
DLLSUFFIX=.dylib # ???
|
||||
GTKCOMPAT32 = 0
|
||||
WITHOUT_GTK ?= 1
|
||||
|
||||
ifeq (1,$(SDL_FRAMEWORK))
|
||||
SDL_INCLUDES=-I$(APPLE_FRAMEWORKS)/SDL.framework/Headers -I$(APPLE_FRAMEWORKS)/SDL_mixer.framework/Headers
|
||||
|
|
|
@ -33,13 +33,16 @@
|
|||
# define WIN32_LEAN_AND_MEAN
|
||||
# include <windows.h>
|
||||
# include "winbits.h"
|
||||
#elif defined __APPLE__
|
||||
#endif
|
||||
#if defined __APPLE__
|
||||
# include "osxbits.h"
|
||||
# include <mach/mach.h>
|
||||
# include <mach/mach_time.h>
|
||||
#elif defined HAVE_GTK2
|
||||
#endif
|
||||
#if defined HAVE_GTK2
|
||||
# include "gtkbits.h"
|
||||
#elif defined GEKKO
|
||||
#endif
|
||||
#if defined GEKKO
|
||||
# define HW_RVL
|
||||
# include <ogc/lwp.h>
|
||||
# include <ogc/lwp_watchdog.h>
|
||||
|
|
|
@ -237,9 +237,12 @@ function dobuildem() # build EDuke32 and Mapster32
|
|||
|
||||
# A little factoring:
|
||||
commonargs="OSX_STARTUPWINDOW=1 WITHOUT_GTK=1"
|
||||
if [ $buildppc == 1 ]; then
|
||||
if [ $buildppc == 1 ] || [ `expr $darwinversion = 9` == 1 ]; then
|
||||
commonargs="$commonargs DARWIN9=1"
|
||||
fi
|
||||
if [ `expr $darwinversion = 10` == 1 ]; then
|
||||
commonargs="$commonargs DARWIN10=1"
|
||||
fi
|
||||
|
||||
if [ $doclean == 1 ]; then
|
||||
cd build
|
||||
|
@ -249,7 +252,6 @@ fi
|
|||
|
||||
# Building the buildtools:
|
||||
if [ $buildtools$installtools != 00 ] && [ -d "build" ]; then
|
||||
cd build
|
||||
|
||||
makecmd="make -k"
|
||||
|
||||
|
@ -288,7 +290,7 @@ if [ $buildtools$installtools != 00 ] && [ -d "build" ]; then
|
|||
"ARCH='-arch ppc' EXESUFFIX_OVERRIDE=.ppc $commonargs RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=0 $makecmd utils"
|
||||
fi
|
||||
|
||||
mkdir -p ../tools
|
||||
mkdir -p tools
|
||||
|
||||
echo buildtools: Creating fat binaries.
|
||||
utils=`make printutils && EXESUFFIX_OVERRIDE=.debug make printutils`
|
||||
|
@ -301,8 +303,8 @@ if [ $buildtools$installtools != 00 ] && [ -d "build" ]; then
|
|||
done
|
||||
if [ -n "$binaries" ]; then
|
||||
lipo -create $binaries -output $i || exit 1
|
||||
# ln -f -s ../build/$i ../tools/$i || exit 1
|
||||
cp -f $i ../tools/$i || exit 1
|
||||
# ln -f -s $i tools/$i || exit 1
|
||||
cp -f $i tools/$i || exit 1
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue