django-rest-framework - Web APIs for Django.

about summary refs log tree commit diff stats

path: root/rest_framework/tests/files.py

diff options

author	Pavel Savchenko	2012-11-28 23:04:10 +0200
committer	Pavel Savchenko	2012-11-28 23:04:10 +0200
commit	050e228edc3a20eceb705946997623a55081c6d1 (patch)
tree	35b50fb87cef9d3808e909921b8262a73c580d3b /rest_framework/tests/files.py
parent	0a4c9f083135a0bf432478c3857efab2c7ed6ee0 (diff)
parent	7eec582d406b9b366f9d364b53d1fc509831d9b4 (diff)
download	django-rest-framework-050e228edc3a20eceb705946997623a55081c6d1.tar.bz2

Merge branch 'patch-2' of https://github.com/asfaltboy/django-rest-framework into fix_authtoken_response

Diffstat (limited to 'rest_framework/tests/files.py')

0 files changed, 0 insertions, 0 deletions

n">args = [] args << "GTK=0" if build.include? "no-gtk" scons *args bin.install 'src/fceux' end end __END__ diff --git a/SConstruct b/SConstruct index 4d5b446..36be2c4 100644 --- a/SConstruct +++ b/SConstruct @@ -62,6 +62,10 @@ if os.environ.has_key('CPPFLAGS'): env.Append(CPPFLAGS = os.environ['CPPFLAGS'].split()) if os.environ.has_key('LDFLAGS'): env.Append(LINKFLAGS = os.environ['LDFLAGS'].split()) +if os.environ.has_key('PKG_CONFIG_PATH'): + env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH'] +if os.environ.has_key('PKG_CONFIG_LIBDIR'): + env['ENV']['PKG_CONFIG_LIBDIR'] = os.environ['PKG_CONFIG_LIBDIR'] print "platform: ", env['PLATFORM'] @@ -112,16 +116,12 @@ else: Exit(1) # Add compiler and linker flags from pkg-config config_string = 'pkg-config --cflags --libs gtk+-2.0' - if env['PLATFORM'] == 'darwin': - config_string = 'PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig/ ' + config_string env.ParseConfig(config_string) env.Append(CPPDEFINES=["_GTK2"]) env.Append(CCFLAGS = ["-D_GTK"]) if env['GTK3']: # Add compiler and linker flags from pkg-config config_string = 'pkg-config --cflags --libs gtk+-3.0' - if env['PLATFORM'] == 'darwin': - config_string = 'PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig/ ' + config_string env.ParseConfig(config_string) env.Append(CPPDEFINES=["_GTK3"]) env.Append(CCFLAGS = ["-D_GTK"]) diff --git a/SConstruct b/SConstruct index dc6698e..a23350a 100644 --- a/SConstruct +++ b/SConstruct @@ -18,7 +18,7 @@ opts.AddVariables( BoolVariable('RELEASE', 'Set to 1 to build for release', 1), BoolVariable('FRAMESKIP', 'Enable frameskipping', 1), BoolVariable('OPENGL', 'Enable OpenGL support', 1), - BoolVariable('LUA', 'Enable Lua support', 1), + BoolVariable('LUA', 'Enable Lua support', 0), BoolVariable('GTK', 'Enable GTK2 GUI (SDL only)', 1), BoolVariable('GTK3', 'Enable GTK3 GUI (SDL only)', 0), BoolVariable('NEWPPU', 'Enable new PPU core', 1), diff --git a/src/drivers/sdl/SConscript b/src/drivers/sdl/SConscript index 7a53b07..23e11b9 100644 --- a/src/drivers/sdl/SConscript +++ b/src/drivers/sdl/SConscript @@ -2,8 +2,6 @@ # Thanks Antonio Ospite! Import('env') config_string = 'pkg-config --cflags --libs x11' -if env['PLATFORM'] == 'darwin': - config_string = 'PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig/ ' + config_string env.ParseConfig(config_string) Export('env')


context:
space:
mode: