head	1.3;
access;
symbols
	RELEASE_8_3_0:1.3
	RELEASE_9_0_0:1.3
	RELEASE_7_4_0:1.2
	RELEASE_8_2_0:1.2
	RELEASE_6_EOL:1.2
	RELEASE_8_1_0:1.2
	RELEASE_7_3_0:1.2
	RELEASE_8_0_0:1.2
	RELEASE_7_2_0:1.2
	RELEASE_7_1_0:1.2
	RELEASE_6_4_0:1.2;
locks; strict;
comment	@# @;


1.3
date	2011.03.07.19.42.56;	author amdmi3;	state Exp;
branches;
next	1.2;

1.2
date	2008.08.21.22.31.18;	author amdmi3;	state Exp;
branches;
next	1.1;

1.1
date	2008.08.19.20.40.19;	author amdmi3;	state Exp;
branches;
next	;


desc
@@


1.3
log
@- Update to 1.0.93

PR:		154168
Submitted by:	Rusty Nejdl <rnejdl@@ringofsaturn.com>
@
text
@--- src/lib/SCsub.orig	2011-01-20 07:48:43.000000000 +0100
+++ src/lib/SCsub	2011-01-20 07:58:30.000000000 +0100
@@@@ -9,10 +9,7 @@@@
 	'tolua_to.c',
 	]
 
-env.lib_target_static = env.Library('#/lib/'+env['tolua_lib']+'_static', sources)
-
-if env['shared']:
-	env.lib_target = env.SharedLibrary('#lib/'+env['tolua_lib'], sources)
-else:
-	env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
+env.lib_target_static = env.Library('#/lib/'+env['tolua_lib'], sources)
+env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
+env.lib_target += env.SharedLibrary('#/lib/'+env['tolua_lib'], sources)
 
@


1.2
log
@- Fix shared lib support
@
text
@d1 4
a4 3
--- src/lib/SCsub.orig	2005-11-28 16:51:15.000000000 +0300
+++ src/lib/SCsub	2008-08-22 01:44:24.000000000 +0400
@@@@ -10,4 +10,5 @@@@
d7 8
a14 1
 env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
@


1.1
log
@- Build shared library in addition to static [1]
- Fix compilation with gcc43 [2]

PRs:		126659 [1], 126660 [2]
Submitted by:	Tim Niemueller <tim at niemueller dot de>
@
text
@d2 2
a3 3
+++ src/lib/SCsub	2008-08-19 22:57:11.000000000 +0400
@@@@ -9,5 +9,6 @@@@
 	'tolua_to.c',
d6 1
a6 2
-env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
+env.lib_target  = env.Library('#/lib/'+env['tolua_lib'], sources)
@

