m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch by Thomas Bernard: improve detection of SDL and Lua for macOS.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2174 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2017-01-14 08:47:42 +00:00
parent 9c6f343215
commit 76d4630b4c
1 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/Makefile
View File

@ -105,21 +105,31 @@ else
BIN = ../bin/grafx2 BIN = ../bin/grafx2
SVN_REVISION = $(shell svnversion | cut -f2 -d ":" - | tr -d "M") SVN_REVISION = $(shell svnversion | cut -f2 -d ":" - | tr -d "M")
SDLCONFIG := $(shell which sdl-config)
ifneq ($(SDLCONFIG), )
# these are for use with macports # these are for use with macports
#SDLCOPT = $(shell sdl-config --cflags) SDLCOPT = $(shell sdl-config --cflags)
#SDLLOPT = $(shell sdl-config --libs) $(shell pkg-config --libs SDL_image) SDLLOPT = $(shell sdl-config --libs) $(shell pkg-config --libs SDL_image)
#LUACOPT = $(shell pkg-config lua --cflags --silence-errors ||pkg-config lua5.1 --cflags --silence-errors ||pkg-config lua-5.1 --cflags) else
#LUALOPT = $(shell pkg-config lua --libs --silence-errors ||pkg-config lua5.1 --libs --silence-errors ||pkg-config lua-5.1 --libs)
# these are for use with Mac OS X native frameworks # these are for use with Mac OS X native frameworks
#-framework SDL_ttf #-framework SDL_ttf
SDLLOPT = -isysroot $(MACOSX_SYSROOT) $(MACOSX_ARCH) -L/usr/lib -framework SDL -framework SDL_image -framework Cocoa -framework Carbon -framework OpenGL SDLLOPT = -isysroot $(MACOSX_SYSROOT) $(MACOSX_ARCH) -L/usr/lib -framework SDL -framework SDL_image -framework Cocoa -framework Carbon -framework OpenGL
SDLCOPT = $(MACOSX_ARCH) -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE SDLCOPT = $(MACOSX_ARCH) -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE
endif
# these are for use with macports
LUAPKG := $(shell for p in lua5.1 lua-5.1 lua51 lua ; do pkg-config --exists $$p && echo $$p && break ; done)
ifneq ($(LUAPKG), )
LUACOPT = $(shell pkg-config $(LUAPKG) --cflags)
LUALOPT = $(shell pkg-config $(LUAPKG) --libs)
else
# these are for use with Mac OS X native frameworks
LUACOPT = -I$(FWDIR)/Lua.framework/Headers LUACOPT = -I$(FWDIR)/Lua.framework/Headers
ifdef MACOSX_LION ifdef MACOSX_LION
LUALOPT = -framework lua LUALOPT = -framework lua
else else
LUALOPT = -llua LUALOPT = -llua
endif
endif endif
# these are for everyone # these are for everyone
@ -127,7 +137,15 @@ endif
ifdef MACOSX_LION ifdef MACOSX_LION
LOPT = $(SDLLOPT) $(LUALOPT) -framework libpng14 -lz LOPT = $(SDLLOPT) $(LUALOPT) -framework libpng14 -lz
else else
LOPT = $(SDLLOPT) $(LUALOPT) -lpng -lz LOPT = $(SDLLOPT) $(LUALOPT)
LIBPNGCONFIG := $(shell libpng-config)
ifneq ($(LIBPNGCONFIG), )
COPT += $(shell libpng-config --cflags)
LOPT += $(shell libpng-config --ldflags)
else
LOPT += -lpng
endif
LOPT += -lz
endif endif
# Use gcc for compiling. Use ncc to build a callgraph and analyze the code. # Use gcc for compiling. Use ncc to build a callgraph and analyze the code.
CC = gcc CC = gcc
@ -288,8 +306,9 @@ endif
LUACOPT = LUACOPT =
LUALOPT = LUALOPT =
else else
LUACOPT = $(shell pkg-config lua --cflags --silence-errors ||pkg-config lua5.1 --cflags --silence-errors ||pkg-config lua-5.1 --cflags) LUAPKG := $(shell for p in lua5.1 lua-5.1 lua51 lua ; do pkg-config --exists $$p && echo $$p && break ; done)
LUALOPT = $(shell pkg-config lua --libs --silence-errors ||pkg-config lua5.1 --libs --silence-errors ||pkg-config lua-5.1 --libs) LUACOPT = $(shell pkg-config $(LUAPKG) --cflags)
LUALOPT = $(shell pkg-config $(LUAPKG) --libs)
endif endif
endif endif
@ -484,17 +503,19 @@ $(MACAPPEXE) : $(BIN)
cp -r ../share/grafx2/scripts/samples_2.4/picture Grafx2.app/Contents/Resources/scripts/samples_2.4 cp -r ../share/grafx2/scripts/samples_2.4/picture Grafx2.app/Contents/Resources/scripts/samples_2.4
ifdef MACOSX_LION ifdef MACOSX_LION
mkdir -p Grafx2.app/Contents/Frameworks/Lua.framework/Versions mkdir -p Grafx2.app/Contents/Frameworks/Lua.framework/Versions
mkdir -p Grafx2.app/Contents/Frameworks/libpng14.framework/Versions
endif
mkdir -p Grafx2.app/Contents/Frameworks/SDL.framework/Versions
mkdir -p Grafx2.app/Contents/Frameworks/SDL_image.framework/Versions
# mkdir -p Grafx2.app/Contents/Frameworks/SDL_ttf.framework/Versions
ifdef MACOSX_LION
cp -Rp $(FWDIR)/Lua.framework/Versions/A Grafx2.app/Contents/Frameworks/Lua.framework/Versions cp -Rp $(FWDIR)/Lua.framework/Versions/A Grafx2.app/Contents/Frameworks/Lua.framework/Versions
mkdir -p Grafx2.app/Contents/Frameworks/libpng14.framework/Versions
cp -Rp $(FWDIR)/libpng14.framework/Versions/1.4.8 Grafx2.app/Contents/Frameworks/libpng14.framework/Versions cp -Rp $(FWDIR)/libpng14.framework/Versions/1.4.8 Grafx2.app/Contents/Frameworks/libpng14.framework/Versions
endif endif
cp -Rp $(FWDIR)/SDL.framework/Versions/A Grafx2.app/Contents/Frameworks/SDL.framework/Versions if [ -d $(FWDIR)/SDL.framework/Versions ] ; then \
cp -Rp $(FWDIR)/SDL_image.framework/Versions/A Grafx2.app/Contents/Frameworks/SDL_image.framework/Versions mkdir -p Grafx2.app/Contents/Frameworks/SDL.framework/Versions ;\
cp -Rp $(FWDIR)/SDL.framework/Versions/A Grafx2.app/Contents/Frameworks/SDL.framework/Versions ;\
fi
if [ -d $(FWDIR)/SDL_image.framework/Versions ] ; then \
mkdir -p Grafx2.app/Contents/Frameworks/SDL_image.framework/Versions ;\
cp -Rp $(FWDIR)/SDL_image.framework/Versions/A Grafx2.app/Contents/Frameworks/SDL_image.framework/Versions ;\
fi
# mkdir -p Grafx2.app/Contents/Frameworks/SDL_ttf.framework/Versions
# cp -Rp $(FWDIR)/SDL_ttf.framework/Versions/A Grafx2.app/Contents/Frameworks/SDL_ttf.framework/Versions # cp -Rp $(FWDIR)/SDL_ttf.framework/Versions/A Grafx2.app/Contents/Frameworks/SDL_ttf.framework/Versions
# remove those # remove those
rm -fr Grafx2.app/Contents/Frameworks/SDL.framework/Versions/A/Headers rm -fr Grafx2.app/Contents/Frameworks/SDL.framework/Versions/A/Headers