Update of /cvsroot/wxlua/wxLua
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209
Modified Files:
configure
Log Message:
multiple fixes to the build system: updated DSP/DSW, renamed some targets, now wxStEdit libname is correctly used, removed unused files from CVS
Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** configure 8 Dec 2006 13:19:56 -0000 1.40
--- configure 10 Dec 2006 00:47:20 -0000 1.41
***************
*** 6812,6815 ****
--- 6812,6820 ----
+
+
+
+
+
# check for STC wrapper for wxWidgets
if [ "$USE_WXBINDSTC" = "1" ]; then
***************
*** 6998,7001 ****
--- 7003,7023 ----
+ WXLIKE_LIBNAME="wx""_""$WX_PORT"
+
+ if test "$WX_PORT" = "gtk"; then
+ WXLIKE_LIBNAME="$WXLIKE_LIBNAME""$WX_GTKPORT_VERSION"
+ fi
+
+ if test "$WX_UNICODE" = "1"; then
+ WXLIKE_LIBNAME="$WXLIKE_LIBNAME""u"
+ fi
+ if test "$WX_DEBUG" = "1"; then
+ WXLIKE_LIBNAME="$WXLIKE_LIBNAME""d"
+ fi
+
+ WXLIKE_LIBNAME="$WXLIKE_LIBNAME""_""stedit""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR"
+
+
+
major=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\1/'`
minor=`echo $minversion | sed 's/\([0-9]\).\([0-9]\).\([0-9]\)/\2/'`
***************
*** 7018,7022 ****
CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
! LIBS="$LIBS -lstedit $WX_LIBS"
if test -z "$COMPCHECK_MSG"; then
--- 7040,7044 ----
CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
! LIBS="$LIBS -l$WXLIKE_LIBNAME $WX_LIBS"
if test -z "$COMPCHECK_MSG"; then
***************
*** 9568,9572 ****
# the wx.so library in ../lib; thus we need to copy the sample(s) to the
# build directory to preserve the relative path correctness
! if [ ! -z "$srcdir" ]; then
{ echo "$as_me:$LINENO: configure: copying $srcdir/samples to ./samples" >&5
--- 9590,9594 ----
# the wx.so library in ../lib; thus we need to copy the sample(s) to the
# build directory to preserve the relative path correctness
! if [ "$top_srcdir" != "." ]; then
{ echo "$as_me:$LINENO: configure: copying $srcdir/samples to ./samples" >&5
|
