Commits

Leonard Ritter  committed f7d5c86

A bunch of OSX build fixes

  • Participants
  • Parent commits bb33bab

Comments (0)

Files changed (3)

File site_scons/site_init.py

     
     name = 'darwin' + base.name
     system = 'Darwin'
+    flags = '-I/usr/X11R6/include'
+    linkflags = ['-L/usr/X11R6/lib']
     platforms = {
         PlatformDarwin_x86 : dict(
             flags = '-m32',

File site_scons/site_tools/xplib.py

 import os
 from sconstk import *
 
-def pkg_config(env, target, source, MIN_VERSION=None, DEB_NAME=None):
+def pkg_config(env, target, source, MIN_VERSION=None, DEB_NAME=None, MANUAL=None):
     source = source[0]
     error_msg = None
     missing = False
         if error_msg:
             Error(error_msg)
         env.ParseConfig("pkg-config %s --cflags --libs" % source)
+    elif MANUAL:
+        env.Append(**MANUAL)
 
 def apt_get(env, target, source):
     if not env['has_aptget']:
     )
     
 def exists(*args):
-    print 'exists',args
+    print 'exists',args

File src/SConscript

         'datenwerkpp',
     ]
 )
-env.PkgConfig('sdl', DEB_NAME='libsdl1.2-dev')
+
+env.PkgConfig('sdl', DEB_NAME='libsdl1.2-dev', MANUAL=dict(
+    CPPPATH = [
+        '/usr/include/SDL',
+        '/usr/local/include/SDL'
+    ],
+    LIBS = [
+        'SDL'
+    ]
+))
 env.PkgConfig('SDL_image', DEB_NAME='libsdl-image1.2-dev')
 #env.PkgConfig('cairomm-1.0')
 #env.PkgConfig('librsvg-2.0')
 
 craftlike = env.Program('craftlike', env.Glob('*.cpp'))
 
-Return('craftlike')
+Return('craftlike')