[Scummvm-cvs-logs] scummvm master -> a5695f6bfda17df214d4a91bfd9eada75d51ddf8

criezy criezy at scummvm.org
Wed Dec 23 23:25:07 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a5695f6bfd OSX: Fix make bundle target when using SDL2


Commit: a5695f6bfda17df214d4a91bfd9eada75d51ddf8
    https://github.com/scummvm/scummvm/commit/a5695f6bfda17df214d4a91bfd9eada75d51ddf8
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2015-12-23T22:15:11Z

Commit Message:
OSX: Fix make bundle target when using SDL2

Changed paths:
    configure
    ports.mk



diff --git a/configure b/configure
index e1ee583..16823f5 100755
--- a/configure
+++ b/configure
@@ -4612,6 +4612,7 @@ STAGINGPATH=$_stagingpath
 WIN32PATH=$_win32path
 AMIGAOSPATH=$_amigaospath
 STATICLIBPATH=$_staticlibpath
+SDLCONFIG=$_sdlconfig
 
 ABI := $ABI
 
diff --git a/ports.mk b/ports.mk
index 1be3c44..adc28d4 100644
--- a/ports.mk
+++ b/ports.mk
@@ -95,7 +95,7 @@ endif
 # Location of static libs for the iPhone
 ifneq ($(BACKEND), iphone)
 # Static libaries, used for the scummvm-static and iphone targets
-OSX_STATIC_LIBS := `$(STATICLIBPATH)/bin/sdl-config --static-libs`
+OSX_STATIC_LIBS := `$(SDLCONFIG) --static-libs`
 endif
 
 ifdef USE_FREETYPE2






More information about the Scummvm-git-logs mailing list