Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:52
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/docs Modified Files: changelog.txt Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** changelog.txt 28 Sep 2006 22:26:03 -0000 1.19 --- changelog.txt 11 Dec 2006 00:08:19 -0000 1.20 *************** *** 3,7 **** =============== ! version 2.6.3.0 -------------------------------------------------------------------- --- 3,7 ---- =============== ! version 2.8.0.0 -------------------------------------------------------------------- *************** *** 48,51 **** --- 48,58 ---- specify what they are used for, eg. debugger and debuggee. - Cleaned up and made more robust the wxlua IDE app. + - Moved distribution-stuff into "distrib" to make it clear what is build-related + and what is for making wxLua distributions + - Added PCH support + - Now builds with different configurations are fully supported: both the build + directory and the output folders for the libraries and for the binaries are + named with the chosen configuration so that there should be no clashes + when compiling wxLua with different settings. |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:52
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/build/bakefiles Modified Files: wxlua.bkl wxluabase.bkl Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxluabase.bkl 10 Dec 2006 18:04:25 -0000 1.25 --- wxluabase.bkl 11 Dec 2006 00:08:19 -0000 1.26 *************** *** 99,102 **** --- 99,131 ---- </set> + <!-- + Note that for the output folder of the binaries, we need to use WXLUA_LIBPOSTFIX + to differentiate among the different Unicode/ANSI debug/release builds. + This is not necessary in the WXLUA_LIBOUTPUT_FOLDER and WXLUA_DLLOUTPUT_FOLDER vars + because, unlike for the executables which need to be named always the same way, + the library names themselves contain the WXLUA_LIBPOSTFIX. + --> + <set var="WXLUA_BINSTATIC_OUTPUT_FOLDER"> + <if cond="TARGETING_WIN32=='1'"> + bin/$(COMPILER)$(WXLUA_LIBPOSTFIX)_lib + </if> + <if cond="TARGETING_WIN32=='0'"> + bin + </if> + </set> + <set var="WXLUA_BINSHARED_OUTPUT_FOLDER"> + <if cond="TARGETING_WIN32=='1'"> + bin/$(COMPILER)$(WXLUA_LIBPOSTFIX)_dll + </if> + <if cond="TARGETING_WIN32=='0'"> + bin + </if> + </set> + <set var="WXLUA_BINOUTPUT_FOLDER"> + <if cond="TARGETING_WIN32=='1' and SHARED=='1'">$(WXLUA_BINSHARED_OUTPUT_FOLDER)</if> + <if cond="TARGETING_WIN32=='1' and SHARED=='0'">$(WXLUA_BINSTATIC_OUTPUT_FOLDER)</if> + <if cond="TARGETING_WIN32=='0'">bin</if> <!-- shared & static builds go to the same folder --> + </set> + <if cond="TARGETING_WIN32=='1'"> <set var="SUBPROJECT_POSTFIX_PATH">build/msw</set> Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxlua.bkl 8 Dec 2006 13:19:58 -0000 1.27 --- wxlua.bkl 11 Dec 2006 00:08:19 -0000 1.28 *************** *** 62,66 **** <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set> <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set> </if> <if cond="FORMAT=='autoconf'"> --- 62,66 ---- <set var="WXLUA_LIBOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_LIBOUTPUT_FOLDER)</set> <set var="WXLUA_DLLOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_DLLOUTPUT_FOLDER)</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_BINOUTPUT_FOLDER)</set> </if> <if cond="FORMAT=='autoconf'"> *************** *** 68,83 **** <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)/$(WXLUA_LIBOUTPUT_FOLDER)</set> <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)/$(WXLUA_DLLOUTPUT_FOLDER)</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)/bin</set> </if> <if cond="TARGETING_IDE=='0'"> - <if cond="TARGETING_WIN32=='1'"> - <!-- on linux we don't need this because WXLUA_LIBOUTPUT_PATH == WXLUA_DLLOUTPUT_PATH --> - <mkdir id="setuplibdir"> - <dependency-of>all</dependency-of> - <dir>$(WXLUA_LIBOUTPUT_PATH)</dir> - </mkdir> - </if> - <!-- the folders where output will be stored --> <mkdir id="setupdlldir"> --- 68,75 ---- <set var="WXLUA_LIBOUTPUT_PATH">$(top_builddir)/$(WXLUA_LIBOUTPUT_FOLDER)</set> <set var="WXLUA_DLLOUTPUT_PATH">$(top_builddir)/$(WXLUA_DLLOUTPUT_FOLDER)</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)/$(WXLUA_BINOUTPUT_FOLDER)</set> </if> <if cond="TARGETING_IDE=='0'"> <!-- the folders where output will be stored --> <mkdir id="setupdlldir"> *************** *** 89,92 **** --- 81,92 ---- <dir>$(WXLUA_BINOUTPUT_PATH)</dir> </mkdir> + + <if cond="TARGETING_WIN32=='1'"> + <!-- on linux we don't need this because WXLUA_LIBOUTPUT_PATH == WXLUA_DLLOUTPUT_PATH --> + <mkdir id="setuplibdir"> + <dependency-of>all</dependency-of> + <dir>$(WXLUA_LIBOUTPUT_PATH)</dir> + </mkdir> + </if> </if> |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:51
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/apps/build/bakefiles Modified Files: apps.bkl Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** apps.bkl 10 Dec 2006 00:47:21 -0000 1.43 --- apps.bkl 11 Dec 2006 00:08:18 -0000 1.44 *************** *** 20,24 **** <!-- Win32 makefiles will be put in BUILD/MSW --> <set var="WXLUA_BASEDIR">../../..</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set> <set-srcdir>../..</set-srcdir> --- 20,24 ---- <!-- Win32 makefiles will be put in BUILD/MSW --> <set var="WXLUA_BASEDIR">../../..</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/$(WXLUA_BINOUTPUT_FOLDER)</set> <set-srcdir>../..</set-srcdir> |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:51
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346 Modified Files: configure Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** configure 10 Dec 2006 00:47:20 -0000 1.41 --- configure 11 Dec 2006 00:08:17 -0000 1.42 *************** *** 733,736 **** --- 733,739 ---- REZ SETFILE + GCC_PCH + ICC_PCH + BK_MAKE_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_UNICODE_0 *************** *** 740,743 **** --- 743,748 ---- COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 + COND_GCC_PCH_1 + COND_ICC_PCH_1 COND_INSTALL_CUSTOM_WXBIND_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 *************** *** 761,764 **** --- 766,770 ---- COND_USE_APPS_1 COND_USE_BIN2C_1 + COND_USE_PCH_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 *************** *** 1389,1392 **** --- 1395,1400 ---- don't use dependency tracking even if the compiler can + --disable-precomp-headers + don't use precompiled headers even if compiler can Optional Packages: *************** *** 9330,9333 **** --- 9338,9589 ---- BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" + + + # Check whether --enable-precomp-headers was given. + if test "${enable_precomp_headers+set}" = set; then + enableval=$enable_precomp_headers; bk_use_pch="$enableval" + fi + + + GCC_PCH=0 + ICC_PCH=0 + USE_PCH=0 + BK_MAKE_PCH="" + + case ${BAKEFILE_HOST} in + *-*-cygwin* ) + bk_use_pch="no" + ;; + esac + + if test "x$bk_use_pch" = "x" -o "x$bk_use_pch" = "xyes" ; then + if test "x$GCC" = "xyes"; then + { echo "$as_me:$LINENO: checking if the compiler supports precompiled headers" >&5 + echo $ECHO_N "checking if the compiler supports precompiled headers... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + #if !defined(__GNUC__) || !defined(__GNUC_MINOR__) + There is no PCH support + #endif + #if (__GNUC__ < 3) + There is no PCH support + #endif + #if (__GNUC__ == 3) && \ + ((!defined(__APPLE_CC__) && (__GNUC_MINOR__ < 4)) || \ + ( defined(__APPLE_CC__) && (__GNUC_MINOR__ < 3))) || \ + ( defined(__INTEL_COMPILER) ) + There is no PCH support + #endif + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + GCC_PCH=1 + + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + int + main () + { + + #if !defined(__INTEL_COMPILER) || \ + (__INTEL_COMPILER < 800) + There is no PCH support + #endif + + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" + case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; + esac + eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + ICC_PCH=1 + + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6; } + + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $GCC_PCH = 1 -o $ICC_PCH = 1 ; then + USE_PCH=1 + + D='$' + cat <<EOF >bk-make-pch + #!/bin/sh + + # This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf + # script. It is used to generated precompiled headers. + # + # Permission is given to use this file in any way. + + outfile="${D}{1}" + header="${D}{2}" + shift + shift + + compiler="" + headerfile="" + + while test ${D}{#} -gt 0; do + add_to_cmdline=1 + case "${D}{1}" in + -I* ) + incdir=\`echo ${D}{1} | sed -e 's/-I\\(.*\\)/\\1/g'\` + if test "x${D}{headerfile}" = "x" -a -f "${D}{incdir}/${D}{header}" ; then + headerfile="${D}{incdir}/${D}{header}" + fi + ;; + -use-pch|-use_pch ) + shift + add_to_cmdline=0 + ;; + esac + if test ${D}add_to_cmdline = 1 ; then + compiler="${D}{compiler} ${D}{1}" + fi + shift + done + + if test "x${D}{headerfile}" = "x" ; then + echo "error: can't find header ${D}{header} in include paths" >&2 + else + if test -f ${D}{outfile} ; then + rm -f ${D}{outfile} + else + mkdir -p \`dirname ${D}{outfile}\` + fi + depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d" + mkdir -p .deps + if test "x${GCC_PCH}" = "x1" ; then + # can do this because gcc is >= 3.4: + ${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}" + elif test "x${ICC_PCH}" = "x1" ; then + filename=pch_gen-${D}${D} + file=${D}{filename}.c + dfile=${D}{filename}.d + cat > ${D}file <<EOT + #include "${D}header" + EOT + # using -MF icc complains about differing command lines in creation/use + ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\ + sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\ + rm -f ${D}file ${D}dfile ${D}{filename}.o + fi + exit ${D}{?} + fi + EOF + + chmod +x bk-make-pch + BK_MAKE_PCH="`pwd`/bk-make-pch" + fi + fi + fi + + + + + COND_BUILD_DEBUG="#" if test "x$BUILD" = "xdebug" ; then *************** *** 9365,9368 **** --- 9621,9634 ---- fi + COND_GCC_PCH_1="#" + if test "x$GCC_PCH" = "x1" ; then + COND_GCC_PCH_1="" + fi + + COND_ICC_PCH_1="#" + if test "x$ICC_PCH" = "x1" ; then + COND_ICC_PCH_1="" + fi + COND_INSTALL_CUSTOM_WXBIND_1="#" if test "x$INSTALL_CUSTOM_WXBIND" = "x1" ; then *************** *** 9470,9473 **** --- 9736,9744 ---- fi + COND_USE_PCH_1="#" + if test "x$USE_PCH" = "x1" ; then + COND_USE_PCH_1="" + fi + COND_USE_SOSYMLINKS_1="#" if test "x$USE_SOSYMLINKS" = "x1" ; then *************** *** 9601,9690 **** fi - # Create the output folders in the current build directory - # (this handles cases like: - # mkdir mybuild && cd mybuild && ../configure && make ) - { as_dir=lib - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || - echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 - echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - { as_dir=bin - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || - $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || - echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 - echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure --- 9872,9875 ---- *************** *** 10480,10483 **** --- 10665,10671 ---- REZ!$REZ$ac_delim SETFILE!$SETFILE$ac_delim + GCC_PCH!$GCC_PCH$ac_delim + ICC_PCH!$ICC_PCH$ac_delim + BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim *************** *** 10487,10490 **** --- 10675,10680 ---- COND_DEPS_TRACKING_0!$COND_DEPS_TRACKING_0$ac_delim COND_DEPS_TRACKING_1!$COND_DEPS_TRACKING_1$ac_delim + COND_GCC_PCH_1!$COND_GCC_PCH_1$ac_delim + COND_ICC_PCH_1!$COND_ICC_PCH_1$ac_delim COND_INSTALL_CUSTOM_WXBIND_1!$COND_INSTALL_CUSTOM_WXBIND_1$ac_delim COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1$ac_delim *************** *** 10508,10511 **** --- 10698,10702 ---- COND_USE_APPS_1!$COND_USE_APPS_1$ac_delim COND_USE_BIN2C_1!$COND_USE_BIN2C_1$ac_delim + COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim COND_USE_SOSYMLINKS_1!$COND_USE_SOSYMLINKS_1$ac_delim COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim *************** *** 10532,10536 **** _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then break elif $ac_last_try; then --- 10723,10727 ---- _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then break elif $ac_last_try; then |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:27
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/modules/wxluasocket/src Added Files: dummy.cpp Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings --- NEW FILE: dummy.cpp --- /* * File: src/common/dummy.cpp * Purpose: See below * Author: Julian Smart * Created: 1993 * Updated: * Copyright: (c) 1993, AIAI, University of Edinburgh */ /* A dummy file to include wx.h. If precompiling wx.h, * always start by compiling this and producing the PCH file. * Then subsequent source files use the PCH file. * * If precompiling wx.h for wxWidgets and derived apps, * link dummy.obj with your program. * * This will produce a big PCH file. */ #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifdef __WXMSW__ #include "wx/msw/msvcrt.h" #endif #ifdef __VISAGECPP__ char wxDummyChar = 0; #endif |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:27
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/modules/wxluadebug/src Added Files: dummy.cpp Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings --- NEW FILE: dummy.cpp --- /* * File: src/common/dummy.cpp * Purpose: See below * Author: Julian Smart * Created: 1993 * Updated: * Copyright: (c) 1993, AIAI, University of Edinburgh */ /* A dummy file to include wx.h. If precompiling wx.h, * always start by compiling this and producing the PCH file. * Then subsequent source files use the PCH file. * * If precompiling wx.h for wxWidgets and derived apps, * link dummy.obj with your program. * * This will produce a big PCH file. */ #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifdef __WXMSW__ #include "wx/msw/msvcrt.h" #endif #ifdef __VISAGECPP__ char wxDummyChar = 0; #endif |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:27
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/modules/wxlua/src Added Files: dummy.cpp Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings --- NEW FILE: dummy.cpp --- /* * File: src/common/dummy.cpp * Purpose: See below * Author: Julian Smart * Created: 1993 * Updated: * Copyright: (c) 1993, AIAI, University of Edinburgh */ /* A dummy file to include wx.h. If precompiling wx.h, * always start by compiling this and producing the PCH file. * Then subsequent source files use the PCH file. * * If precompiling wx.h for wxWidgets and derived apps, * link dummy.obj with your program. * * This will produce a big PCH file. */ #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifdef __WXMSW__ #include "wx/msw/msvcrt.h" #endif #ifdef __VISAGECPP__ char wxDummyChar = 0; #endif |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:27
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/modules/wxbind/src Added Files: dummy.cpp Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings --- NEW FILE: dummy.cpp --- /* * File: src/common/dummy.cpp * Purpose: See below * Author: Julian Smart * Created: 1993 * Updated: * Copyright: (c) 1993, AIAI, University of Edinburgh */ /* A dummy file to include wx.h. If precompiling wx.h, * always start by compiling this and producing the PCH file. * Then subsequent source files use the PCH file. * * If precompiling wx.h for wxWidgets and derived apps, * link dummy.obj with your program. * * This will produce a big PCH file. */ #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifdef __WXMSW__ #include "wx/msw/msvcrt.h" #endif #ifdef __VISAGECPP__ char wxDummyChar = 0; #endif |
|
From: Francesco M. <fr...@us...> - 2006-12-11 00:08:26
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7346/modules/wxbindstc/src Added Files: dummy.cpp Log Message: Added PCH support; now output folder for binaries are configuration-dependent to avoid problems when building wxLua with different settings --- NEW FILE: dummy.cpp --- /* * File: src/common/dummy.cpp * Purpose: See below * Author: Julian Smart * Created: 1993 * Updated: * Copyright: (c) 1993, AIAI, University of Edinburgh */ /* A dummy file to include wx.h. If precompiling wx.h, * always start by compiling this and producing the PCH file. * Then subsequent source files use the PCH file. * * If precompiling wx.h for wxWidgets and derived apps, * link dummy.obj with your program. * * This will produce a big PCH file. */ #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifdef __WXMSW__ #include "wx/msw/msvcrt.h" #endif #ifdef __VISAGECPP__ char wxDummyChar = 0; #endif |
|
From: John L. <jr...@us...> - 2006-12-10 23:28:16
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23681/wxLua/samples Modified Files: editor.wx.lua Log Message: cleanup, better message output, more error checking Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** editor.wx.lua 8 Dec 2006 06:16:18 -0000 1.37 --- editor.wx.lua 10 Dec 2006 23:28:12 -0000 1.38 *************** *** 8,11 **** --- 8,36 ---- -------------------------------------------------------------------------=--- + -- Equivalent to C's "cond ? a : b", all terms will be evaluated + function iff(cond, a, b) if cond then return a else return b end end + + -- Does the num has all the bits in value + function HasBit(value, num) + for n = 32, 0, -1 do + local b = 2^n [...1425 lines suppressed...] end else ! local editor = CreateEditor("Untitled") SetupKeywords(editor, true) end --frame:SetIcon(wxLuaEditorIcon) --FIXME add this back --- 2085,2096 ---- notebook:SetSelection(0) else ! local editor = CreateEditor("untitled.lua") SetupKeywords(editor, true) end else ! local editor = CreateEditor("untitled.lua") SetupKeywords(editor, true) end --frame:SetIcon(wxLuaEditorIcon) --FIXME add this back + frame:Show(true) |
|
From: John L. <jr...@us...> - 2006-12-10 23:28:16
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23681/wxLua/apps/wxlua/src Modified Files: editor.h Log Message: cleanup, better message output, more error checking Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** editor.h 8 Dec 2006 06:16:17 -0000 1.29 --- editor.h 10 Dec 2006 23:28:12 -0000 1.30 *************** *** 9,2052 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 75835; ! const unsigned char wxLuaEditor[75836] = { ! 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, ! 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, ! 45, 45, 32, 80,117,114,112,111,115,101, 58, 32, 32, 32, 32, 32,119,120, 76,117, 97, 32, 73, 68, 69, 10, ! 45, 45, 32, 65,117,116,104,111,114, 58, 32, 32, 32, 32, 32, 32, 74, 32, 87,105,110,119,111,111,100, 10, ! 45, 45, 32, 67,114,101, 97,116,101,100, 58, 32, 32, 32, 32, 32, 77, 97,114, 99,104, 32, 50, 48, 48, 50, 10, ! 45, 45, 32, 67,111,112,121,114,105,103,104,116, 58, 32, 32, 32, 40, 99, 41, 32, 50, 48, 48, 50, 45, 53, 32, 76,111,109,116,105, 99,107, 32, 83,111,102,116,119, 97,114,101, 46, 32, 65,108,108, 32,114,105,103,104,116,115, 32,114,101,115,101,114,118,101,100, 46, 10, [...4117 lines suppressed...] ! 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,102,105,108,101, 78, 97,109,101, 32,126, 61, 32, 34, 45, 45, 34, 32,116,104,101,110, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 76,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,110,105,108, 44, 32,116,114,117,101, 41, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 13, 10, ! 32, 32, 32, 32,101,110,100, 13, 10, ! 13, 10, ! 32, 32, 32, 32,105,102, 32,110,111,116,101, 98,111,111,107, 58, 71,101,116, 80, 97,103,101, 67,111,117,110,116, 40, 41, 32, 62, 32, 48, 32,116,104,101,110, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,110,111,116,101, 98,111,111,107, 58, 83,101,116, 83,101,108,101, 99,116,105,111,110, 40, 48, 41, 13, 10, ! 32, 32, 32, 32,101,108,115,101, 13, 10, ! 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 67,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34,117,110,116,105,116,108,101,100, 46,108,117, 97, 34, 41, 13, 10, ! 32, 32, 32, 32, 32, 32, 32, 83,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32,116,114,117,101, 41, 13, 10, ! 32, 32, 32, 32,101,110,100, 13, 10, ! 101,108,115,101, 13, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 67,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34,117,110,116,105,116,108,101,100, 46,108,117, 97, 34, 41, 13, 10, ! 32, 32, 32, 32, 83,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32,116,114,117,101, 41, 13, 10, ! 101,110,100, 13, 10, ! 13, 10, ! 45, 45,102,114, 97,109,101, 58, 83,101,116, 73, 99,111,110, 40,119,120, 76,117, 97, 69,100,105,116,111,114, 73, 99,111,110, 41, 32, 45, 45, 70, 73, 88, 77, 69, 32, 97,100,100, 32,116,104,105,115, 32, 98, 97, 99,107, 13, 10, ! 102,114, 97,109,101, 58, 83,104,111,119, 40,116,114,117,101, 41, 13, 10, 0 }; |
|
From: Francesco M. <fr...@us...> - 2006-12-10 18:04:32
|
Update of /cvsroot/wxlua/wxLua/distrib/innosetup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26921/distrib/innosetup Added Files: Readme.txt modifypath.iss wxlua.iss Log Message: moved distribution stuff out of the build directory --- NEW FILE: modifypath.iss --- [Code] // Version log: // 03/31/2003: Initial release (thv(at)lr.dk) const // Modification method pmAddToBeginning = $1; // Add dir to beginning of Path pmAddToEnd = $2; // Add dir to end of Path pmAddAllways = $4; // Add also if specified dir is already included in existing path pmAddOnlyIfDirExists = $8; // Add only if specified dir actually exists pmRemove = $10; // Remove dir from path pmRemoveSubdirsAlso = $20; // Remove dir and all subdirs from path // Scope psCurrentUser = 1; // Modify path for current user psAllUsers = 2; // Modify path for all users // Error results mpOK = 0; // No errors mpMissingRights = -1; // User has insufficient rights mpAutoexecNoWriteacc = -2; // Autoexec can not be written (may be readonly) mpBothAddAndRemove = -3; // User has specified that dir should both be removed from and added to path { Helper procedure: Split a path environment variable into individual dirnames } procedure SplitPath(Path: string; var Dirs: TStringList); var pos: integer; s: string; begin Dirs.Clear; s := ''; pos := 1; while (pos<=Length(Path)) do begin if (Path[pos]<>';') then s := s + Path[pos]; if ((Path[pos]=';') or (pos=Length(Path))) then begin s := Trim(s); s := RemoveQuotes(s); s := Trim(s); if (s <> '') then Dirs.Add(s); s := ''; end; Pos := Pos + 1; end; end; // procedure SplitPath { Helper procedure: Concatenate individual dirnames into a path environment variable } procedure ConcatPath(Dirs: TStringList; Quotes: boolean; var Path: string); var Index, MaxIndex: integer; s: string; begin MaxIndex := Dirs.Count-1; Path := ''; for Index := 0 to MaxIndex do begin s := Dirs.Strings[Index]; if ((Quotes) and (pos(' ',s) > 0)) then s := AddQuotes(s); Path := Path + s; if (Index < MaxIndex) then Path := Path + ';' end; end; // procedure ConcatPath { Helper function: Modifies path environment string } procedure ModifyPathString(OldPath, DirName: string; Method: integer; Quotes: boolean; var ResultPath: string); var Dirs: TStringList; DirNotInPath: Boolean; i: integer; begin // Create Dirs variable Dirs := TStringList.Create; // Remove quotes form DirName DirName := Trim(DirName); DirName := RemoveQuotes(DirName); DirName := Trim(DirName); // Split old path in individual directory names SplitPath(OldPath, Dirs); // Check if dir is allready in path DirNotInPath := True; for i:=Dirs.Count-1 downto 0 do begin if (uppercase(Dirs.Strings[i]) = uppercase(DirName)) then DirNotInPath := False; end; // Should dir be removed from existing Path? if ((Method and (pmRemove or pmRemoveSubdirsAlso)) > 0) then begin for i:=Dirs.Count-1 downto 0 do begin if (((Method and pmRemoveSubdirsAlso) > 0) and (pos(uppercase(DirName)+'', uppercase(Dirs.Strings[i])) = 1)) or (((Method and (pmRemove) or (pmRemoveSubdirsAlso)) > 0) and (uppercase(DirName) = uppercase(Dirs.Strings[i]))) then Dirs.Delete(i); end; end; // Should dir be added to existing Path? if ((Method and (pmAddToBeginning or pmAddToEnd)) > 0) then begin // Add dir to path if (((Method and pmAddAllways) > 0) or DirNotInPath) then begin // Dir is not in path allready or should be added anyway if (((Method and pmAddOnlyIfDirExists) = 0) or (DirExists(DirName))) then begin // Dir actually exsists or should be added anyway if ((Method and pmAddToBeginning) > 0) then Dirs.Insert(0, DirName) else Dirs.Append(DirName); end; end; end; // Concatenate directory names into one single path variable ConcatPath(Dirs, Quotes, ResultPath); // Finally free Dirs object Dirs.Free; end; // ModifyPathString { Helper function: Modify path on Windows 9x } function ModifyPath9x(DirName: string; Method: integer): integer; var AutoexecLines: TStringList; ActualLine: String; PathLineNos: TStringList; FirstPathLineNo: Integer; OldPath, ResultPath: String; LineNo, CharNo, Index: integer; TempString: String; begin // Expect everything to be OK result := mpOK; // Create stringslists AutoexecLines := TStringList.Create; PathLineNos := TStringList.Create; // Read existing path OldPath := ''; LoadStringFromFile('c:\Autoexec.bat', TempString); AutoexecLines.Text := TempString; PathLineNos.Clear; // Read Autoexec line by line for LineNo := 0 to AutoexecLines.Count - 1 do begin ActualLine := AutoexecLines.Strings[LineNo]; // Check if line starts with "PATH=" after first stripping spaces and other "fill-chars" if Pos('=', ActualLine) > 0 then begin for CharNo := Pos('=', ActualLine)-1 downto 1 do if (ActualLine[CharNo]=' ') or (ActualLine[CharNo]=#9) then Delete(ActualLine, CharNo, 1); if Pos('@', ActualLine) = 1 then Delete(ActualLine, 1, 1); if (Pos('PATH=', uppercase(ActualLine))=1) or (Pos('SETPATH=', uppercase(ActualLine))=1) then begin // Remove 'PATH=' and add path to "OldPath" variable Delete(ActualLine, 1, pos('=', ActualLine)); // Check if an earlier PATH variable is referenced, but there has been no previous PATH defined in Autoexec if (pos('%PATH%',uppercase(ActualLine))>0) and (PathLineNos.Count=0) then OldPath := ExpandConstant('{win}') + ';' + ExpandConstant('{win}')+'\COMMAND'; if (pos('%PATH%',uppercase(ActualLine))>0) then begin ActualLine := Copy(ActualLine, 1, pos('%PATH%',uppercase(ActualLine))-1) + OldPath + Copy(ActualLine, pos('%PATH%',uppercase(ActualLine))+6, Length(ActualLine)); end; OldPath := ActualLine; // Update list of line numbers holding path variables PathLineNos.Add(IntToStr(LineNo)); end; end; end; // Save first line number in Autoexec.bat which modifies path environment variable if PathLineNos.Count > 0 then FirstPathLineNo := StrToInt(PathLineNos.Strings[0]) else FirstPathLineNo := 0; // Modify path ModifyPathString(OldPath, DirName, Method, True, ResultPath); // Write Modified path back to Autoexec.bat // First delete all existing path references from Autoexec.bat Index := PathLineNos.Count-1; while (Index>=0) do begin AutoexecLines.Delete(StrToInt(PathLineNos.Strings[Index])); Index := Index-1; end; // Then insert new path variable into Autoexec.bat AutoexecLines.Insert(FirstPathLineNo, '@PATH='+ResultPath); // Delete old Autoexec.bat from disk if not DeleteFile('c:\Autoexec.bat') then result := mpAutoexecNoWriteAcc; Sleep(500); // And finally write Autoexec.bat back to disk if not (result=mpAutoexecNoWriteAcc) then SaveStringToFile('c:\Autoexec.bat', AutoexecLines.Text, false); // Free stringlists PathLineNos.Free; AutoexecLines.Free; end; // ModifyPath9x { Helper function: Modify path on Windows NT, 2000 and XP } function ModifyPathNT(DirName: string; Method, Scope: integer): integer; var RegRootKey: integer; RegSubKeyName: string; RegValueName: string; OldPath, ResultPath: string; OK: boolean; begin // Expect everything to be OK result := mpOK; // Initialize registry key and value names to reflect if changes should be global or local to current user only case Scope of psCurrentUser: begin RegRootKey := HKEY_CURRENT_USER; RegSubKeyName := 'Environment'; RegValueName := 'Path'; end; psAllUsers: begin RegRootKey := HKEY_LOCAL_MACHINE; RegSubKeyName := 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment'; RegValueName := 'Path'; end; end; // Read current path value from registry OK := RegQueryStringValue(RegRootKey, RegSubKeyName, RegValueName, OldPath); if not OK then begin result := mpMissingRights; Exit; end; // Modify path ModifyPathString(OldPath, DirName, Method, False, ResultPath); // Write new path value to registry if not RegWriteStringValue(RegRootKey, RegSubKeyName, RegValueName, ResultPath) then begin result := mpMissingRights; Exit; end; end; // ModifyPathNT { Main function: Modify path } function ModifyPath(Path: string; Method, Scope: integer): integer; begin // Check if both add and remove has been specified (= error!) if (Method and (pmAddToBeginning or pmAddToEnd) and (pmRemove or pmRemoveSubdirsAlso)) > 0 then begin result := mpBothAddAndRemove; Exit; end; // Perform directory constant expansion Path := ExpandConstantEx(Path, ' ', ' '); // Test if Win9x if InstallOnThisVersion('4,0','0,0') = irInstall then ModifyPath9x(Path, Method); // Test if WinNT, 2000 or XP if InstallOnThisVersion('0,4','0,0') = irInstall then ModifyPathNT(Path, Method, Scope); end; // ModifyPath --- NEW FILE: wxlua.iss --- ; -- wxLua InnoSetup -- ; Author: Francesco Montorsi ; Date: 20/2/2006 ; $Id: wxlua.iss,v 1.1 2006/12/10 18:04:25 frm Exp $ ; should be the same version of: ; 1) build\autoconf\configure.ac ; 2) WXLUA_RELEASE variable in build/bakefiles/wxluabase.bkl #define VERSION "2.6.2.0" [Setup] ; version-related VersionInfoVersion={#VERSION} AppVerName=wxLua {#VERSION} OutputBaseFilename=wxLua-{#VERSION}-setup ; compiler-related SourceDir=..\.. OutputDir=..\..\.. Compression=lzma/fast SolidCompression=yes ; installer-related AppName=wxLua ChangesAssociations=yes DefaultDirName={pf}\wxLua DefaultGroupName=wxLua AllowNoIcons=yes LicenseFile=docs\licence.txt ShowLanguageDialog=yes ; cosmetic WindowShowCaption=true WindowStartMaximized=false FlatComponentsList=true WindowResizable=false ShowTasksTreeLines=false SetupIconFile=art\wxlua.ico AppPublisherURL=http://wxlua.sourceforge.net/ AppSupportURL=http://wxlua.sourceforge.net/ AppUpdatesURL=http://wxlua.sourceforge.net/ VersionInfoCopyright=Copyright (C) 2006 wxLua developers. AppCopyright=Copyright (C) 2006 by wxLua developers [Components] Name: main; Description: Main Files; Types: full compact custom; Flags: fixed Name: help; Description: Help Files; Types: full compact Name: sources; Description: Source Files; Types: full [Files] ; main component Source: art\*; DestDir: {app}\art; Components: main Source: bin\*.exe; DestDir: {app}\bin; Components: main ; help component Source: docs\*; DestDir: {app}\docs; Flags: recursesubdirs; Components: help Source: samples\*; DestDir: {app}\samples; Flags: recursesubdirs; Components: help ; sources component Source: bindings\*; DestDir: {app}\bindings; Flags: recursesubdirs; Components: sources Source: util\*; DestDir: {app}\util; Flags: recursesubdirs; Components: sources ; be careful with these dirs (as they could contain a lot of temp stuff) Source: apps\*; Excludes: build\msw\msvc*,build\msw\bcc*; DestDir: {app}\apps; Flags: recursesubdirs; Components: sources Source: modules\*; Excludes: build\msw\msvc*,build\msw\bcc*; DestDir: {app}\modules; Flags: recursesubdirs; Components: sources Source: build\*; Excludes: \msw\msvc*,\msw\bcc*; DestDir: {app}\build; Flags: recursesubdirs; Components: sources Source: lib\*; Excludes: *.lib*,*.dll*; DestDir: {app}\lib; Components: sources [Messages] BeveledLabel=wxLua [UninstallDelete] [Tasks] Name: startmenu; Description: Create icons in Start menu; GroupDescription: Additional icons:; Components: main Name: desktopicon; Description: Create a &desktop icon; GroupDescription: Additional icons:; Components: main Name: quicklaunchicon; Description: Create a &Quick Launch icon; GroupDescription: Additional icons:; Components: main; Flags: unchecked Name: associateopen; Description: Associate OPEN action for .lua files with wxLua interpreter; GroupDescription: Other tasks:; Components: main Name: associateedit; Description: Associate EDIT action for .lua files with wxLuaEditor; GroupDescription: Other tasks:; Components: main [Icons] Name: {group}\wxLua; Filename: {app}\bin\wxlua.exe; WorkingDir: {app}; Components: main; Tasks: startmenu Name: {group}\wxLuaEditor; Filename: {app}\bin\wxluaedit.exe; WorkingDir: {app}; Components: main; Tasks: startmenu Name: {group}\wxLua docs; Filename: {app}\docs\doxygen\html\index.html; Components: help; Tasks: startmenu Name: {userdesktop}\wxLuaEditor; Filename: {app}\bin\wxluaedit.exe; WorkingDir: {app}; Components: main; Tasks: desktopicon Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\wxLua; Filename: {app}\bin\wxluaedit.exe; Tasks: quicklaunchicon [Registry] ; create .lua filetype and associate an icon to it Root: HKCR; Subkey: .lua; ValueType: string; ValueName: ; ValueData: wxLuaFile; Flags: uninsdeletevalue; Tasks: associateedit or associateopen Root: HKCR; Subkey: wxLuaFile; ValueType: string; ValueName: ; ValueData: wxLua File; Flags: uninsdeletekey; Tasks: associateedit or associateopen Root: HKCR; Subkey: wxLuaFile\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\art\wxlua.ico,0; Tasks: associateedit or associateopen ; associate the EDIT action for .lua extensions with the wxLuaEditor program Root: HKCR; Subkey: wxLuaFile\shell\edit\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\wxluaedit.exe"" ""%1"""; Tasks: associateedit ; associate the OPEN action for .lua extensions with the wxLua interpreter Root: HKCR; Subkey: wxLuaFile\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\bin\wxlua.exe"" ""%1"""; Tasks: associateopen --- NEW FILE: Readme.txt --- Notes about wxlua.iss ===================== To build the windows installer of wxLua you need: 1) InnoSetup and InnoSetup Preprocessor (http://www.jrsoftware.org/isinfo.php) 2) UPX (http://upx.sourceforge.net) To actually build do: 1) go in wxLua\build\msw and build with MSVC or BORLAND compiler the entire wxLua project using the USE_WXLUAEDIT=1 option 2) run the 'compress' utility target to optimize the .exe 3) run the 'docs' utility target to create doxygen docs 4) open the wxLua\build\innosetup\wxlua.iss file 5) eventually update version numbers 6) click 'Compile' to create in wxLua\.. the installer. |
|
From: Francesco M. <fr...@us...> - 2006-12-10 18:04:30
|
Update of /cvsroot/wxlua/wxLua/distrib/autopackage In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26921/distrib/autopackage Added Files: default.apspec.in wxlua.desktop wxlua.xml Log Message: moved distribution stuff out of the build directory --- NEW FILE: wxlua.xml --- <?xml version="1.0" encoding="UTF-8"?> <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info" xmlns:apkg="http://autopackage.org/xdgmime-extensions"> <mime-type type="application/lua"> <comment>Lua script</comment> <glob pattern="*.lua" /> <alias type="text/lua" /> <apkg:icon>wxlua.xpm</apkg:icon> </mime-type> </mime-info> --- NEW FILE: default.apspec.in --- # -*-shell-script-*- [Meta] RootName: @wxlua.sourceforge.net/wxlua:$SOFTWAREVERSION DisplayName: Lua bindings for wxWidgets ShortName: wxlua Maintainer: Francesco Montorsi <fr...@us...> Packager: Francesco Montorsi <fr...@us...> Summary: wxLua provides Lua bindings to the wxWidgets toolkit URL: http://wxlua.sourceforge.net/ License: wxWindows license SoftwareVersion: @PACKAGE_VERSION@ Revision: 1 PackageVersion: 1 AutopackageTarget: 1.2 PackageFileName: $SHORTNAME-$SOFTWAREVERSION-$PACKAGEVERSION.x86.package Compression: bzip2 [Description] wxLua is a set of bindings to wxWidgets for the Lua language. With wxLua you can write programs in Lua that use the wxWidgets cross-platform GUI library to develop and deliver your software with the programming ease of an interpreted language like Lua. [BuildPrepare] # we must tell apgcc to resolve the -l options with (wx)Lua libraries # to their absolute path otherwise they will be considered as shared # and the order of the lib will be messed !! export APBUILD_RESOLVE_LIBPATH=".*lua.*" export APBUILD_STATIC="tiff expat" prepareBuild --disable-shared --disable-debug --disable-customwxbind-install --with-wxdir=/home/frm/work/wxGTK-2.6.3 [BuildUnprepare] unprepareBuild [Imports] rm -rf include lib # do not include headers & libraries ! echo '*' | import [Prepare] # only wxGTK required: lua and wxStEdit are statically built in require @wxwidgets.org/wxgtk 26.0 [Install] installExe bin/* installData share/wxlua installIcon share/pixmaps/wxlua.xpm installMime share/mime/packages/wxlua.xml installDesktop "Development" share/applications/wxlua.desktop [Uninstall] uninstallFromLog --- NEW FILE: wxlua.desktop --- [Desktop Entry] Name=wxLua Editor Comment=Editor for Lua script files Exec=wxluaedit %F Encoding=UTF-8 Terminal=false Type=Application MimeType=application/lua; Categories=Application;Development; Icon=wxlua.xpm X-GNOME-DocPath= |
|
From: Francesco M. <fr...@us...> - 2006-12-10 18:04:29
|
Update of /cvsroot/wxlua/wxLua/build/macbundle In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26921/build/macbundle Removed Files: wxLua.icns wxLua.r.gz Log Message: moved distribution stuff out of the build directory --- wxLua.r.gz DELETED --- --- wxLua.icns DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-12-10 18:04:29
|
Update of /cvsroot/wxlua/wxLua/distrib/macbundle In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26921/distrib/macbundle Added Files: wxLua.icns wxLua.r.gz Log Message: moved distribution stuff out of the build directory --- NEW FILE: wxLua.r.gz --- (This appears to be a binary file; contents omitted.) --- NEW FILE: wxLua.icns --- (This appears to be a binary file; contents omitted.) |
|
From: Francesco M. <fr...@us...> - 2006-12-10 18:04:29
|
Update of /cvsroot/wxlua/wxLua/build/innosetup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26921/build/innosetup Removed Files: Readme.txt wxlua.iss Log Message: moved distribution stuff out of the build directory --- wxlua.iss DELETED --- --- Readme.txt DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-12-10 18:04:29
|
Update of /cvsroot/wxlua/wxLua/build/autopackage In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26921/build/autopackage Removed Files: default.apspec.in wxlua.desktop wxlua.xml Log Message: moved distribution stuff out of the build directory --- wxlua.xml DELETED --- --- default.apspec.in DELETED --- --- wxlua.desktop DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-12-10 18:04:29
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26921/build/bakefiles Modified Files: wxluabase.bkl Log Message: moved distribution stuff out of the build directory Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxluabase.bkl 10 Dec 2006 00:47:22 -0000 1.24 --- wxluabase.bkl 10 Dec 2006 18:04:25 -0000 1.25 *************** *** 32,36 **** and in 1) build\autoconf\configure.ac ! 2) build\innosetup\wxlua.iss files. Remember to update all of them ! --> --- 32,36 ---- and in 1) build\autoconf\configure.ac ! 2) distrib\innosetup\wxlua.iss files. Remember to update all of them ! --> |
|
From: Francesco M. <fr...@us...> - 2006-12-10 17:50:24
|
Update of /cvsroot/wxlua/wxLua/distrib/autopackage In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20830/autopackage Log Message: Directory /cvsroot/wxlua/wxLua/distrib/autopackage added to the repository |
|
From: Francesco M. <fr...@us...> - 2006-12-10 17:50:15
|
Update of /cvsroot/wxlua/wxLua/distrib/macbundle In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20830/macbundle Log Message: Directory /cvsroot/wxlua/wxLua/distrib/macbundle added to the repository |
|
From: Francesco M. <fr...@us...> - 2006-12-10 17:50:15
|
Update of /cvsroot/wxlua/wxLua/distrib/innosetup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20830/innosetup Log Message: Directory /cvsroot/wxlua/wxLua/distrib/innosetup added to the repository |
|
From: Francesco M. <fr...@us...> - 2006-12-10 17:50:03
|
Update of /cvsroot/wxlua/wxLua/distrib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20627/distrib Log Message: Directory /cvsroot/wxlua/wxLua/distrib added to the repository |
|
From: Francesco M. <fr...@us...> - 2006-12-10 00:47:57
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209/apps/build/bakefiles Modified Files: apps.bkl 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: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** apps.bkl 8 Dec 2006 13:19:57 -0000 1.42 --- apps.bkl 10 Dec 2006 00:47:21 -0000 1.43 *************** *** 78,82 **** <!-- ================================================================== --> ! <exe id="app_lua" template="wxlua"> <app-type>console</app-type> <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> --- 78,82 ---- <!-- ================================================================== --> ! <exe id="app_verbatimlua" template="wxlua"> <app-type>console</app-type> <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> *************** *** 100,105 **** </exe> - - <!-- ================================================================== --> <!-- The WXLUA application target --> --- 100,103 ---- *************** *** 144,148 **** <wxlua-alllibs/> ! <sys-lib>stedit</sys-lib> <!-- Library for wxCode's wxStedit component --> <wx-lib>stc</wx-lib> <wx-alllibs-req-bywxlua/> --- 142,146 ---- <wxlua-alllibs/> ! <wxlike-lib>stedit</wxlike-lib> <!-- Library for wxCode's wxStedit component --> <wx-lib>stc</wx-lib> <wx-alllibs-req-bywxlua/> |
|
From: Francesco M. <fr...@us...> - 2006-12-10 00:47:57
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209/build/autoconf Modified Files: aclocal.m4 configure.ac 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.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** configure.ac 8 Dec 2006 13:19:57 -0000 1.31 --- configure.ac 10 Dec 2006 00:47:22 -0000 1.32 *************** *** 187,190 **** --- 187,220 ---- ]) + + dnl --------------------------------------------------------------------------- + dnl AM_SET_WXLIKE_LIBNAME([prefix], [name]) + dnl + dnl Sets the WXLIKE_LIBNAME string to the name of a library named with same + dnl wxWidgets rules (e.g. for name=='test', prefix="mine", sets WXLIKE_LIBNAME + dnl to 'mine_gtk2[u][d]_test-2.8' if WX_PORT=gtk2 and WX_VERSION=28) + dnl --------------------------------------------------------------------------- + AC_DEFUN([AM_SET_WXLIKE_LIBNAME], + [ + WXLIKE_LIBNAME="$1""_""$WX_PORT" + + if test "$WX_PORT" = "gtk"; then + WXLIKE_LIBNAME="$WXLIKE_LIBNAME""$WX_GTKPORT_VERSION" + fi + + dnl add the [u][d] string + if test "$WX_UNICODE" = "1"; then + WXLIKE_LIBNAME="$WXLIKE_LIBNAME""u" + fi + if test "$WX_DEBUG" = "1"; then + WXLIKE_LIBNAME="$WXLIKE_LIBNAME""d" + fi + + dnl complete name of the lib + WXLIKE_LIBNAME="$WXLIKE_LIBNAME""_""$2""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" + ]) + + + # check for STC wrapper for wxWidgets if [[ "$USE_WXBINDSTC" = "1" ]]; then *************** *** 228,234 **** minversion="1.2.0" AM_WXCODE_CHECKFOR_COMPONENT_VERSION([wxStEdit], [wx/stedit/stedit.h], ! [stedit], [wxSTEditor dummy;], [$minversion], [STE_], [_VERSION], ! [ac_cv_prog_stedit_set=1], [ac_cv_prog_stedit_set=0]) if test $ac_cv_prog_stedit_set = "1"; then --- 258,268 ---- minversion="1.2.0" + AM_SET_WXLIKE_LIBNAME([wx], [stedit]) + AM_WXCODE_CHECKFOR_COMPONENT_VERSION([wxStEdit], [wx/stedit/stedit.h], ! [$WXLIKE_LIBNAME], [wxSTEditor dummy;], [$minversion], ! [STE_], [_VERSION], ! [ac_cv_prog_stedit_set=1], ! [ac_cv_prog_stedit_set=0]) if test $ac_cv_prog_stedit_set = "1"; then *************** *** 300,304 **** # 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 AC_MSG_NOTICE([configure: copying $srcdir/samples to ./samples]) --- 334,338 ---- # 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 AC_MSG_NOTICE([configure: copying $srcdir/samples to ./samples]) |
|
From: Francesco M. <fr...@us...> - 2006-12-10 00:47:57
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18209/apps Modified Files: Makefile.in 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: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** Makefile.in 8 Dec 2006 13:19:57 -0000 1.44 --- Makefile.in 10 Dec 2006 00:47:21 -0000 1.45 *************** *** 44,52 **** DESTDIR = ! APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) ! APP_LUA_OBJECTS = \ ! app_lua_lua.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) --- 44,52 ---- DESTDIR = ! APP_VERBATIMLUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) ! APP_VERBATIMLUA_OBJECTS = \ ! app_verbatimlua_lua.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) *************** *** 91,96 **** @COND_WX_DEBUG_1_WX_UNICODE_0@WXLIBPOSTFIX = d @COND_WX_DEBUG_0_WX_UNICODE_1@WXLIBPOSTFIX = u ! @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL \ @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxlua-lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ --- 91,96 ---- @COND_WX_DEBUG_1_WX_UNICODE_0@WXLIBPOSTFIX = d @COND_WX_DEBUG_0_WX_UNICODE_1@WXLIBPOSTFIX = u ! @COND_PLATFORM_MAC_1@__app_verbatimlua___mac_setfilecmd \ ! @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxlua-lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ *************** *** 156,162 **** all: $(top_builddir)/bin/wxlua-lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) ! install: all install_app_lua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install --- 156,162 ---- all: $(top_builddir)/bin/wxlua-lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) ! install: all install_app_verbatimlua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_verbatimlua $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install *************** *** 179,196 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_builddir)/bin/wxlua-lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -llua5.1 ! $(__app_lua___mac_setfilecmd) ! install_app_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(top_builddir)/bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_lua: rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)/bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) --- 179,196 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_builddir)/bin/wxlua-lua$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) ! $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) ! $(__app_verbatimlua___mac_setfilecmd) ! install_app_verbatimlua: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(top_builddir)/bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_verbatimlua: rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)/bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 205,209 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lstedit $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 205,209 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwx_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 218,222 **** @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 218,222 ---- @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 231,235 **** @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 231,235 ---- @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) *************** *** 243,248 **** @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! app_lua_lua.o: $(srcdir)/../modules/lua/src/lua.c ! $(CCC) -c -o $@ $(APP_LUA_CFLAGS) $(srcdir)/../modules/lua/src/lua.c app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp --- 243,248 ---- @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! app_verbatimlua_lua.o: $(srcdir)/../modules/lua/src/lua.c ! $(CCC) -c -o $@ $(APP_VERBATIMLUA_CFLAGS) $(srcdir)/../modules/lua/src/lua.c app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp *************** *** 292,294 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze --- 292,294 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_verbatimlua uninstall_app_verbatimlua install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze |
