|
oddsocks |
bf269e1 |
--- tolua++-1.0.92/SConstruct.orig 2006-04-10 10:45:44.000000000 +0100
|
|
oddsocks |
bf269e1 |
+++ tolua++-1.0.92/SConstruct 2006-06-02 15:12:34.000000000 +0100
|
|
oddsocks |
bf269e1 |
@@ -22,7 +22,7 @@
|
|
oddsocks |
bf269e1 |
opts.Add('LIBPATH', 'library path', [])
|
|
oddsocks |
bf269e1 |
|
|
oddsocks |
bf269e1 |
opts.Add('tolua_bin', 'the resulting binary', 'tolua++')
|
|
oddsocks |
bf269e1 |
-opts.Add('tolua_lib', 'the resulting library', 'tolua++')
|
|
oddsocks |
bf269e1 |
+opts.Add('tolua_lib', 'the resulting library', 'tolua++-5.1')
|
|
oddsocks |
bf269e1 |
opts.Add('TOLUAPP', 'the name of the tolua++ binary (to use with built_dev=1)', 'tolua++')
|
|
oddsocks |
bf269e1 |
|
|
oddsocks |
bf269e1 |
opts.Add('prefix', 'The installation prefix')
|
|
oddsocks |
bf269e1 |
--- tolua++-1.0.92/config_linux.py.orig 2005-04-30 03:20:38.000000000 +0100
|
|
oddsocks |
bf269e1 |
+++ tolua++-1.0.92/config_linux.py 2006-06-02 15:09:03.000000000 +0100
|
|
oddsocks |
bf269e1 |
@@ -15,8 +15,8 @@
|
|
oddsocks |
bf269e1 |
#
|
|
oddsocks |
bf269e1 |
# You can see more 'generic' options for POSIX systems on config_posix.py
|
|
oddsocks |
bf269e1 |
|
|
oddsocks |
bf269e1 |
-prefix = '/usr/local'
|
|
oddsocks |
bf269e1 |
+prefix = '/usr'
|
|
oddsocks |
bf269e1 |
|
|
oddsocks |
bf269e1 |
# libraries (based on Debian's installation of lua)
|
|
oddsocks |
bf269e1 |
-LIBS = ['lua50', 'lualib50', 'dl', 'm']
|
|
oddsocks |
bf269e1 |
+LIBS = ['lua', 'dl', 'm']
|
|
oddsocks |
bf269e1 |
|
|
oddsocks |
bf269e1 |
--- tolua++-1.0.92/custom-5.1.py.orig 2006-02-13 23:57:26.000000000 +0000
|
|
oddsocks |
bf269e1 |
+++ tolua++-1.0.92/custom-5.1.py 2006-06-02 15:10:08.000000000 +0100
|
|
oddsocks |
bf269e1 |
@@ -1,11 +1,11 @@
|
|
oddsocks |
bf269e1 |
CC = 'gcc'
|
|
oddsocks |
bf269e1 |
CCFLAGS = ['-I/usr/include/lua5.1', '-O2', '-ansi']
|
|
oddsocks |
bf269e1 |
#LIBPATH = ['/usr/local/lib']
|
|
oddsocks |
bf269e1 |
-LIBS = ['lua5.1', 'dl', 'm']
|
|
oddsocks |
bf269e1 |
-prefix = '/usr/local'
|
|
oddsocks |
bf269e1 |
+LIBS = ['lua', 'dl', 'm']
|
|
oddsocks |
bf269e1 |
+prefix = '/usr'
|
|
oddsocks |
bf269e1 |
build_dev = 1
|
|
oddsocks |
bf269e1 |
-ENV = {'PATH': '/usr/local/bin:/bin:/usr/bin'}
|
|
oddsocks |
bf269e1 |
-tolua_bin = 'tolua++5.1'
|
|
oddsocks |
bf269e1 |
-tolua_lib = 'tolua++5.1'
|
|
oddsocks |
bf269e1 |
+ENV = {'PATH': '/bin:/usr/bin:/usr/local/bin'}
|
|
oddsocks |
bf269e1 |
+tolua_bin = 'tolua++'
|
|
oddsocks |
bf269e1 |
+tolua_lib = 'tolua++-5.1'
|
|
oddsocks |
bf269e1 |
TOLUAPP = 'tolua++5.1'
|
|
oddsocks |
bf269e1 |
|
|
oddsocks |
bf269e1 |
--- tolua++-1.0.92/src/lib/SCsub.orig 2005-11-28 13:51:15.000000000 +0000
|
|
oddsocks |
bf269e1 |
+++ tolua++-1.0.92/src/lib/SCsub 2006-06-02 15:11:17.000000000 +0100
|
|
oddsocks |
bf269e1 |
@@ -9,5 +9,4 @@
|
|
oddsocks |
bf269e1 |
'tolua_to.c',
|
|
oddsocks |
bf269e1 |
]
|
|
oddsocks |
bf269e1 |
|
|
oddsocks |
bf269e1 |
-env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
|
|
oddsocks |
bf269e1 |
-
|
|
oddsocks |
bf269e1 |
+env.lib_target = env.SharedLibrary('#/lib/'+env['tolua_lib'], sources)
|