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-01-28 21:01:49
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26072/build/autoconf Modified Files: configure.ac wxlua.pc.in Log Message: fixed things related to library names Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure.ac 23 Jan 2006 19:38:29 -0000 1.5 --- configure.ac 28 Jan 2006 21:01:07 -0000 1.6 *************** *** 79,82 **** --- 79,108 ---- + # Produce some useful info for pkg-config: + AC_DEFUN([AC_ADDMODULE], + [ + dnl the set of the module names, comma separed + WXLUA_MODNAMES="$WXLUA_MODNAMES $1" + TMP="wxlua_$WX_PORT""$WXLIBPOSTFIX""_$1""-$WX_VERSION_MAJOR"".$WX_VERSION_MINOR" + + dnl the set of the wxLua library names + WXLUA_LIBNAMES="$WXLUA_LIBNAMES $TMP" + + dnl the set of the wxLua library names prefixed with -l + WXLUA_LDFLAGS="$WXLUA_LDFLAGS -l$TMP" + ]) + + AC_ADDMODULE([wxluasocket]) + AC_ADDMODULE([wxluadebug]) + AC_ADDMODULE([wxlua]) + AC_ADDMODULE([wxbind]) + AC_ADDMODULE([lua]) + AC_SUBST([WXLUA_MODNAMES]) + AC_SUBST([WXLUA_LIBNAMES]) + AC_SUBST([WXLUA_LDFLAGS]) + + + + Index: wxlua.pc.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxlua.pc.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlua.pc.in 23 Jan 2006 19:38:29 -0000 1.1 --- wxlua.pc.in 28 Jan 2006 21:01:07 -0000 1.2 *************** *** 7,16 **** includepaths=${includedir} libpaths=${libdir} ! libs="wxlua" Name: @PACKAGE_NAME@ Description: wxWidgets lua wrappers Version: @PACKAGE_VERSION@ ! Libs: -L${libdir} -lwxlua Cflags: -I${includedir} --- 7,18 ---- includepaths=${includedir} libpaths=${libdir} ! modnames="@WXLUA_MODNAMES@" ! libnames="@WXLUA_LIBNAMES@" ! wxlua_ldflags="@WXLUA_LDFLAGS@" Name: @PACKAGE_NAME@ Description: wxWidgets lua wrappers Version: @PACKAGE_VERSION@ ! Libs: -L${libdir} @WXLUA_LDFLAGS@ Cflags: -I${includedir} |
|
From: Francesco M. <fr...@us...> - 2006-01-28 21:01:30
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26072/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_lua.dsp modules_mod_lua_lib.dsp modules_mod_wxbind.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: fixed things related to library names Index: modules_mod_lua_lib.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_lua_lib.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** modules_mod_lua_lib.dsp 27 Jan 2006 21:57:11 -0000 1.7 --- modules_mod_lua_lib.dsp 28 Jan 2006 21:01:13 -0000 1.8 *************** *** 8,21 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_lua_lib.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_lua_lib.mak" CFG="mod_lua_lib - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_lua_lib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library") --- 8,21 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_lua_lib.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_lua_lib.mak" CFG="mod_lua_lib - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_lua_lib - Win32 DLL Unicode Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 DLL Unicode Release" (based on "Win32 (x86) Static Library") *************** *** 26,30 **** !MESSAGE "mod_lua_lib - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 Release" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 26,30 ---- !MESSAGE "mod_lua_lib - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_lua_lib - Win32 Release" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 47,52 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 47,52 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 55,60 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode Release" --- 55,60 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua_msw26ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua_msw26ud_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode Release" *************** *** 70,75 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 70,75 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 78,83 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Debug" --- 78,83 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua_msw26u_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua_msw26u_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Debug" *************** *** 93,98 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxmsw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxmsw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 93,98 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 101,106 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxmsw26d_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxmsw26d_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Release" --- 101,106 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxlua_msw26d_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxlua_msw26d_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Release" *************** *** 116,121 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxmsw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxmsw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 116,121 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 124,129 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxmsw26_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxmsw26_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Debug" --- 124,129 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Debug" *************** *** 139,144 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 139,144 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua_msw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 147,152 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Release" --- 147,152 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua_msw26ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua_msw26ud_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Release" *************** *** 162,167 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 162,167 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxlua_msw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 170,175 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Debug" --- 170,175 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua_msw26u_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua_msw26u_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Debug" *************** *** 185,190 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxmsw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxmsw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 185,190 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua_msw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 193,198 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxmsw26d_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxmsw26d_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Release" --- 193,198 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxlua_msw26d_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxlua_msw26d_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Release" *************** *** 208,213 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxmsw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxmsw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 208,213 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 216,221 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxmsw26_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxmsw26_lua.lib" !ENDIF --- 216,221 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_lua.lib" !ENDIF *************** *** 236,348 **** # Begin Source File ! SOURCE=../..\lua\src\lapi.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\lauxlib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\lbaselib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lcode.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\ldblib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ldebug.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ldo.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ldump.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lfunc.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lgc.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\liolib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\llex.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\lmathlib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lmem.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\loadlib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lobject.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lopcodes.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lparser.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lstate.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lstring.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\lstrlib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ltable.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lib\ltablib.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ltests.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\ltm.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lundump.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lvm.c # End Source File # Begin Source File ! SOURCE=../..\lua\src\lzio.c # End Source File # End Group --- 236,348 ---- # Begin Source File ! SOURCE=..\..\lua\src\lapi.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\lauxlib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\lbaselib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lcode.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\ldblib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ldebug.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ldo.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ldump.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lfunc.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lgc.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\liolib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\llex.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\lmathlib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lmem.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\loadlib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lobject.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lopcodes.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lparser.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lstate.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lstring.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\lstrlib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ltable.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lib\ltablib.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ltests.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\ltm.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lundump.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lvm.c # End Source File # Begin Source File ! SOURCE=..\..\lua\src\lzio.c # End Source File # End Group *************** *** 352,368 **** # Begin Source File ! SOURCE=../..\lua\include\lauxlib.h # End Source File # Begin Source File ! SOURCE=../..\lua\include\lua.h # End Source File # Begin Source File ! SOURCE=../..\lua\include\lualib.h # End Source File # Begin Source File ! SOURCE=../..\lua\include\luathread.h # End Source File # End Group --- 352,368 ---- # Begin Source File ! SOURCE=..\..\lua\include\lauxlib.h # End Source File # Begin Source File ! SOURCE=..\..\lua\include\lua.h # End Source File # Begin Source File ! SOURCE=..\..\lua\include\lualib.h # End Source File # Begin Source File ! SOURCE=..\..\lua\include\luathread.h # End Source File # End Group Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** makefile.bcc 27 Jan 2006 21:57:11 -0000 1.19 --- makefile.bcc 28 Jan 2006 21:01:07 -0000 1.20 *************** *** 281,285 **** !if "$(WX_SHARED)" == "0" __wxlua_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib !endif !if "$(WX_SHARED)" == "1" --- 281,285 ---- !if "$(WX_SHARED)" == "0" __wxlua_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib !endif !if "$(WX_SHARED)" == "1" *************** *** 294,298 **** !if "$(WX_SHARED)" == "0" __wxbind_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib !endif !if "$(WX_SHARED)" == "1" --- 294,298 ---- !if "$(WX_SHARED)" == "0" __wxbind_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib !endif !if "$(WX_SHARED)" == "1" *************** *** 307,311 **** !if "$(WX_SHARED)" == "0" __wxluadebug_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib !endif !if "$(WX_SHARED)" == "1" --- 307,311 ---- !if "$(WX_SHARED)" == "0" __wxluadebug_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib !endif !if "$(WX_SHARED)" == "1" *************** *** 321,325 **** !if "$(WX_SHARED)" == "0" __wxluasocket_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib !endif !if "$(WX_SHARED)" == "1" --- 321,325 ---- !if "$(WX_SHARED)" == "0" __wxluasocket_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib !endif !if "$(WX_SHARED)" == "1" *************** *** 380,384 **** ### Targets: ### ! all: ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: --- 380,384 ---- ### Targets: ### ! all: ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: *************** *** 386,390 **** -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib -if exist ..\..\..\bin\lua.exe del ..\..\..\bin\lua.exe -if exist ..\..\..\bin\lua.tds del ..\..\..\bin\lua.tds --- 386,390 ---- -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib -if exist ..\..\..\bin\lua.exe del ..\..\..\bin\lua.exe -if exist ..\..\..\bin\lua.tds del ..\..\..\bin\lua.tds *************** *** 393,397 **** -if exist ..\..\..\bin\lua.ilf del ..\..\..\bin\lua.ilf -if exist ..\..\..\bin\lua.ils del ..\..\..\bin\lua.ils ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.tds --- 393,397 ---- -if exist ..\..\..\bin\lua.ilf del ..\..\..\bin\lua.ilf -if exist ..\..\..\bin\lua.ils del ..\..\..\bin\lua.ils ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.tds *************** *** 400,405 **** -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.tds --- 400,405 ---- -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.tds *************** *** 408,413 **** -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.tds --- 408,413 ---- -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.tds *************** *** 416,421 **** -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.tds --- 416,421 ---- -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.tds *************** *** 424,430 **** -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib: $(MOD_LUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 424,430 ---- -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib: $(MOD_LUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 432,442 **** | ! ..\..\..\bin\lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____WX_DEBUG_8) @&&| ! c0x32.obj $(MOD_LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, | !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib: $(WXLUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 432,442 ---- | ! ..\..\..\bin\lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____WX_DEBUG_8) @&&| ! c0x32.obj $(MOD_LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, | !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib: $(WXLUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 450,458 **** c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib: $(WXBIND_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 450,458 ---- c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib: $(WXBIND_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 466,474 **** c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 466,474 ---- c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 482,490 **** c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib: $(WXLUASOCKET_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 482,490 ---- c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib: $(WXLUASOCKET_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 498,502 **** c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ !endif --- 498,502 ---- c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ !endif Index: modules_mod_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxlua.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** modules_mod_wxlua.dsp 27 Jan 2006 21:57:12 -0000 1.7 --- modules_mod_wxlua.dsp 28 Jan 2006 21:01:14 -0000 1.8 *************** *** 9,22 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak" CFG="mod_wxlua - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library") --- 9,22 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "modules_mod_wxlua.mak" CFG="mod_wxlua - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "mod_wxlua - Win32 DLL Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "mod_wxlua - Win32 DLL Unicode Release" (based on "Win32 (x86) Dynamic-Link Library") *************** *** 27,31 **** !MESSAGE "mod_wxlua - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxlua - Win32 Release" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project --- 27,31 ---- !MESSAGE "mod_wxlua - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE "mod_wxlua - Win32 Release" (based on "Win32 (x86) Static Library") ! !MESSAGE # Begin Project *************** *** 58,63 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllud\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxmsw26ud_wxlua.lib" /debug ! # ADD LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllud\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxmsw26ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release" --- 58,63 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllud\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxlua_msw26ud_wxlua.lib" /debug ! # ADD LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllud\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxlua_msw26ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release" *************** *** 83,88 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllu\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxmsw26u_wxlua.lib" ! # ADD LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllu\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxmsw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug" --- 83,88 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllu\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxlua_msw26u_wxlua.lib" ! # ADD LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllu\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxlua_msw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug" *************** *** 108,113 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dlld\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxmsw26d_wxlua.lib" /debug ! # ADD LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dlld\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxmsw26d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release" --- 108,113 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dlld\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxlua_msw26d_wxlua.lib" /debug ! # ADD LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dlld\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxlua_msw26d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release" *************** *** 133,138 **** # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxmsw26_wxlua.lib" ! # ADD LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxmsw26_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Debug" --- 133,138 ---- # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.lib" ! # ADD LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua_msw26_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Debug" *************** *** 148,153 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 148,153 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua_msw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 156,161 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Release" --- 156,161 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua_msw26ud_wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua_msw26ud_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Release" *************** *** 171,176 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 171,176 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxlua_msw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 179,184 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Debug" --- 179,184 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua_msw26u_wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua_msw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Debug" *************** *** 194,199 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxmsw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxmsw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 194,199 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua_msw26d_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 202,207 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxmsw26d_wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxmsw26d_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Release" --- 202,207 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxlua_msw26d_wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxlua_msw26d_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Release" *************** *** 217,222 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxmsw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxmsw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 217,222 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_lib\wxlua_msw26_wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 225,230 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxmsw26_wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxmsw26_wxlua.lib" !ENDIF --- 225,230 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxlua_msw26_wxlua.lib" !ENDIF *************** *** 245,265 **** # Begin Source File ! SOURCE=../..\wxlua\src\internal.cpp # End Source File # Begin Source File ! SOURCE=../..\wxlua\src\wxlbind.cpp # End Source File # Begin Source File ! SOURCE=../..\wxlua\src\wxlcallb.cpp # End Source File # Begin Source File ! SOURCE=../..\wxlua\src\wxlintrp.cpp # End Source File # Begin Source File ! SOURCE=.... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-01-28 21:01:24
|
Update of /cvsroot/wxlua/wxLua/util/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26072/util/build/msw Modified Files: util.dsp Log Message: fixed things related to library names Index: util.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/util.dsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** util.dsp 27 Jan 2006 21:57:14 -0000 1.7 --- util.dsp 28 Jan 2006 21:01:14 -0000 1.8 *************** *** 8,21 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "util.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "util.mak" CFG="util_bin2c - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "util_bin2c - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "util_bin2c - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application") --- 8,21 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "util.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "util.mak" CFG="util_bin2c - Win32 Release" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "util_bin2c - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application") !MESSAGE "util_bin2c - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application") *************** *** 26,30 **** !MESSAGE "util_bin2c - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "util_bin2c - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE # Begin Project --- 26,30 ---- !MESSAGE "util_bin2c - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE "util_bin2c - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE # Begin Project *************** *** 236,240 **** # Begin Source File ! SOURCE=../..\bin2c\bin2c.c # End Source File # End Group --- 236,240 ---- # Begin Source File ! SOURCE=..\..\bin2c\bin2c.c # End Source File # End Group |
|
From: John L. <jr...@us...> - 2006-01-27 23:01:52
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8263/wxbind/src Modified Files: wxluasetup.h Log Message: by default wxLua links to wxStyledTextCtrl since the wxLua app uses it Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxluasetup.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxluasetup.h 23 Jan 2006 19:38:30 -0000 1.2 --- wxluasetup.h 27 Jan 2006 23:01:43 -0000 1.3 *************** *** 97,101 **** #define wxLUA_USE_wxStatusBar 1 #define wxLUA_USE_wxStringList 1 ! #define wxLUA_USE_wxStyledTextCtrl 0 #define wxLUA_USE_wxSystemSettings 1 #define wxLUA_USE_wxTabCtrl 1 --- 97,101 ---- #define wxLUA_USE_wxStatusBar 1 #define wxLUA_USE_wxStringList 1 ! #define wxLUA_USE_wxStyledTextCtrl 1 #define wxLUA_USE_wxSystemSettings 1 #define wxLUA_USE_wxTabCtrl 1 |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:10
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480 Modified Files: Makefile.in configure Log Message: fixed top_builddir problems Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 23 Jan 2006 21:20:28 -0000 1.6 --- Makefile.in 27 Jan 2006 21:57:05 -0000 1.7 *************** *** 14,17 **** --- 14,19 ---- INSTALL_DIR = @INSTALL_DIR@ srcdir = @srcdir@ + top_srcdir = @top_srcdir@ + top_builddir = @top_builddir@ libdir = @libdir@ *************** *** 33,37 **** ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) install: all $(__install_utils___depname) install_modules $(__install_apps___depname) --- 35,39 ---- ### Targets: ### ! all: $(top_builddir)lib $(top_builddir)bin $(__utils___depname) modules $(__apps___depname) install: all $(__install_utils___depname) install_modules $(__install_apps___depname) *************** *** 53,56 **** --- 55,67 ---- distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile + rm -f ./util/Makefile + rm -f ./modules/Makefile + rm -f ./apps/Makefile + + $(top_builddir)lib: + @mkdir -p $(top_builddir)lib + + $(top_builddir)bin: + @mkdir -p $(top_builddir)bin @COND_USE_UTIL_1@utils: *************** *** 90,93 **** --- 101,110 ---- @COND_USE_APPS_1@ (cd ./apps/ && $(MAKE) install-strip) + docs: + @echo ============================================= + @echo Creating wxLua documentation using doxygen... + @echo ============================================= + ( cd $(top_srcdir)/docs && doxygen doxygen.cfg ) + # Include dependency info, if present: Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** configure 23 Jan 2006 19:38:29 -0000 1.5 --- configure 27 Jan 2006 21:57:05 -0000 1.6 *************** *** 274,278 **** PACKAGE_BUGREPORT='fr...@us...' ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_UTIL_1 COND_USE_WXLUAAPP_1 COND_USE_WXLUAEDITAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_SHARED_0 COND_WX_SHARED_1 LIBOBJS LTLIBOBJS' ac_subst_files='' --- 274,278 ---- PACKAGE_BUGREPORT='fr...@us...' ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION WX_VERSION_MAJOR WX_VERSION_MINOR WX_PORT SET_MAKE MAKE_SET AR ac_ct_AR STRIP ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOS PLATFORM_MACOSX PLATFORM_OS2 PLATFORM_BEOS SO_SUFFIX SO_SUFFIX_MODULE DLLIMP_SUFFIX LIBPREFIX LIBEXT DLLPREFIX DLLPREFIX_MODULE dlldir AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG WINDOWS_IMPLIB USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING WINDRES ac_ct_WINDRES REZ SETFILE COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_WIN32_1 COND_USE_APPS_1 COND_USE_BIN2C_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_USE_UTIL_1 COND_USE_WXLUAAPP_1 COND_USE_WXLUAEDITAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_SHARED_0 COND_WX_SHARED_1 LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 3922,3932 **** ! wx_config_major_version=`echo $WX_VERSION | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` ! wx_config_minor_version=`echo $WX_VERSION | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` WX_VERSION=$wx_config_major_version$wx_config_minor_version if test "$DBG_CONFIGURE" = "1"; then echo "WX_VERSION: $WX_VERSION" --- 3922,3935 ---- ! WX_VERSION_MAJOR=`echo $WX_VERSION | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` ! WX_VERSION_MINOR=`echo $WX_VERSION | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` WX_VERSION=$wx_config_major_version$wx_config_minor_version + + + if test "$DBG_CONFIGURE" = "1"; then echo "WX_VERSION: $WX_VERSION" *************** *** 4504,4507 **** --- 4507,4511 ---- + if test -n "" ; then *************** *** 7265,7268 **** --- 7269,7275 ---- s,@WX_LIBS_STATIC@,$WX_LIBS_STATIC,;t t s,@WX_VERSION@,$WX_VERSION,;t t + s,@WX_VERSION_MAJOR@,$WX_VERSION_MAJOR,;t t + s,@WX_VERSION_MINOR@,$WX_VERSION_MINOR,;t t + s,@WX_PORT@,$WX_PORT,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@MAKE_SET@,$MAKE_SET,;t t *************** *** 7677,7681 **** echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT" fi ! echo " - VERSION: $WX_VERSION" if test "$WX_PORT" = "gtk"; then --- 7684,7688 ---- echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT" fi ! echo " - VERSION: $WX_VERSION_MAJOR.$WX_VERSION_MINOR" if test "$WX_PORT" = "gtk"; then |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:09
|
Update of /cvsroot/wxlua/wxLua/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/util Modified Files: Makefile.in Log Message: fixed top_builddir problems Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.in 25 Jan 2006 18:35:59 -0000 1.8 --- Makefile.in 27 Jan 2006 21:57:13 -0000 1.9 *************** *** 36,43 **** @COND_DEPS_TRACKING_0@CCC = $(CC) @COND_USE_BIN2C_1@__util_bin2c___depname = \ ! @COND_USE_BIN2C_1@ $(top_srcdir)/util/../bin/bin2c$(EXEEXT) @COND_PLATFORM_MAC_1@__util_bin2c___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_srcdir)/util/../bin/bin2c$(EXEEXT) @COND_USE_BIN2C_1@__install_util_bin2c___depname = install_util_bin2c @COND_USE_BIN2C_1@__uninstall_util_bin2c___depname = uninstall_util_bin2c --- 36,42 ---- @COND_DEPS_TRACKING_0@CCC = $(CC) @COND_USE_BIN2C_1@__util_bin2c___depname = \ ! @COND_USE_BIN2C_1@ $(top_builddir)bin/bin2c$(EXEEXT) @COND_PLATFORM_MAC_1@__util_bin2c___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_builddir)bin/bin2c$(EXEEXT) @COND_USE_BIN2C_1@__install_util_bin2c___depname = install_util_bin2c @COND_USE_BIN2C_1@__uninstall_util_bin2c___depname = uninstall_util_bin2c *************** *** 57,66 **** rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_srcdir)/util/../bin/bin2c$(EXEEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_BIN2C_1@$(top_srcdir)/util/../bin/bin2c$(EXEEXT): $(UTIL_BIN2C_OBJECTS) @COND_USE_BIN2C_1@ $(CC) -o $@ $(UTIL_BIN2C_OBJECTS) $(LDFLAGS) @COND_USE_BIN2C_1@ --- 56,65 ---- rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)bin/bin2c$(EXEEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_BIN2C_1@$(top_builddir)bin/bin2c$(EXEEXT): $(UTIL_BIN2C_OBJECTS) @COND_USE_BIN2C_1@ $(CC) -o $@ $(UTIL_BIN2C_OBJECTS) $(LDFLAGS) @COND_USE_BIN2C_1@ *************** *** 69,73 **** @COND_USE_BIN2C_1@install_util_bin2c: @COND_USE_BIN2C_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_BIN2C_1@ $(INSTALL_PROGRAM) $(top_srcdir)/util/../bin/bin2c$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_BIN2C_1@uninstall_util_bin2c: --- 68,72 ---- @COND_USE_BIN2C_1@install_util_bin2c: @COND_USE_BIN2C_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_BIN2C_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/bin2c$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_BIN2C_1@uninstall_util_bin2c: |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:09
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/build/bakefiles Modified Files: wxhacks.bkl wxlua.bkl wxluabase.bkl Log Message: fixed top_builddir problems Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxluabase.bkl 25 Jan 2006 18:35:58 -0000 1.6 --- wxluabase.bkl 27 Jan 2006 21:57:07 -0000 1.7 *************** *** 54,58 **** <if cond="TARGETING_WIN32=='1'"> <!-- Win32 makefiles will be put in BUILD/MSW --> ! <set var="WXLUA_BASEDIR">..$(DIRSEP)..</set> </if> <if cond="TARGETING_WIN32=='0'"> --- 54,58 ---- <if cond="TARGETING_WIN32=='1'"> <!-- Win32 makefiles will be put in BUILD/MSW --> ! <set var="WXLUA_BASEDIR">../..</set> </if> <if cond="TARGETING_WIN32=='0'"> *************** *** 64,71 **** <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib$(DIRSEP)$(COMPILER)_lib$(WXLUA_LIBPOSTFIX) </if> <if cond="TARGETING_WIN32=='0'"> ! lib </if> </set> --- 64,71 ---- <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib/$(COMPILER)_lib$(WXLUA_LIBPOSTFIX) </if> <if cond="TARGETING_WIN32=='0'"> ! lib </if> </set> *************** *** 73,77 **** <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib$(DIRSEP)$(COMPILER)_dll$(WXLUA_LIBPOSTFIX) </if> <if cond="TARGETING_WIN32=='0'"> --- 73,77 ---- <if cond="TARGETING_WIN32=='1'"> <!-- in this case, the COMPILER variable is defined --> ! lib/$(COMPILER)_dll$(WXLUA_LIBPOSTFIX) </if> <if cond="TARGETING_WIN32=='0'"> *************** *** 86,90 **** <if cond="TARGETING_WIN32=='1'"> ! <set var="SUBPROJECT_POSTFIX_PATH">build$(DIRSEP)msw</set> </if> <if cond="TARGETING_WIN32=='0'"> --- 86,90 ---- <if cond="TARGETING_WIN32=='1'"> ! <set var="SUBPROJECT_POSTFIX_PATH">build/msw</set> </if> <if cond="TARGETING_WIN32=='0'"> *************** *** 129,133 **** on *nix: when compiling the samples or the library the user has not installed the library yet ! --> ! <include>$(WXLUA_BASEDIR)$(DIRSEP)modules</include> </template> --- 129,133 ---- on *nix: when compiling the samples or the library the user has not installed the library yet ! --> ! <include>$(WXLUA_BASEDIR)/modules</include> </template> *************** *** 139,143 **** <!-- a template for wxLua-based exe/dll targets --> <template id="wxlua" template="wx,wxlua-base"> ! <lib-path>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_OUTPUT_FOLDER)</lib-path> <!-- same technique used by wx_win32.bkl: this is a placeholder --- 139,143 ---- <!-- a template for wxLua-based exe/dll targets --> <template id="wxlua" template="wx,wxlua-base"> ! <lib-path>$(WXLUA_BASEDIR)/$(WXLUA_OUTPUT_FOLDER)</lib-path> <!-- same technique used by wx_win32.bkl: this is a placeholder Index: wxhacks.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxhacks.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxhacks.bkl 23 Jan 2006 21:20:29 -0000 1.1 --- wxhacks.bkl 27 Jan 2006 21:57:06 -0000 1.2 *************** *** 14,22 **** <!-- Unix. To use it you just need to use the 'wxbase' template --> <!-- together with the 'wx' or 'wx-lib' templates. --> ! <!-- --> ! <!-- --> ! <!-- --> ! <!-- --> ! <!-- --> <!-- This bakefile provides a lot of wxWidgets-specific settings --> --- 14,20 ---- <!-- Unix. To use it you just need to use the 'wxbase' template --> <!-- together with the 'wx' or 'wx-lib' templates. --> ! <!-- For 'autoconf' format this file should be used together with --> ! <!-- wxpresets.m4 macro file which contains a lot of useful macros --> ! <!-- for wx-based projects. See wxpresets.m4 comments for more info. --> <!-- This bakefile provides a lot of wxWidgets-specific settings --> *************** *** 66,69 **** --- 64,72 ---- <option name="WX_VERSION"/> <option name="WX_PORT"/> + + <!-- these option values are available only with autoconf (and using wxpresets.m4) --> + <option name="WX_VERSION_MAJOR"/> + <option name="WX_VERSION_MINOR"/> + <option name="WX_GTKPORT_VERSION"/> </if> <if cond="TARGETING_WIN32=='1'"> *************** *** 72,78 **** ! <!-- ! Set the build directory in a common way which makes us possible to keep separed builds ! done with different settings. User can safely override BUILDDIR in his bakefiles --> <template id="wxbase"> --- 75,80 ---- ! <!-- Combine with 'wx' or 'wx-lib' templates (which are defined in wxpresets) ! to create a perfectly wx-integrated project. --> <template id="wxbase"> *************** *** 95,100 **** </if> ! <!-- On Unix the m4 macros in wxpresets.m4 will set all the options above --> </template> </makefile> --- 97,126 ---- </if> ! <!-- On Unix the m4 macros in wxpresets.m4 will set all the options above. ! Look into wxpresets.m4 for more info. --> </template> + + <!-- + Sets the build directory in a common way which makes us possible to keep separed builds + done with different settings. User can safely override BUILDDIR in his bakefiles. + --> + <if cond="TARGETING_WIN32=='1'"> + <set var="BUILDDIR"> + $(COMPILER)$(WXLIBPOSTFIX) + </set> + </if> + + + <!-- A simple tag which helps you to define a library name using the same rules used + by wxWidgets. --> + <define-tag name="wxlike-libname" rules="lib,dll,module"> + <if cond="TARGETING_WIN32=='1'"> + <libname>wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_$(value)</libname> + </if> + <if cond="TARGETING_WIN32=='0'"> + <libname>wxlua_$(WX_PORT)$(WXLIBPOSTFIX)_$(value)-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)</libname> + </if> + </define-tag> + </makefile> Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxlua.bkl 23 Jan 2006 21:20:29 -0000 1.7 --- wxlua.bkl 27 Jan 2006 21:57:07 -0000 1.8 *************** *** 30,53 **** - <!-- some dummy vars so that unused vars are not removed from the output: - in fact, we do not use WX_DIR/WX_VERSION/... vars directly in this - bakefile and so Bakefile would remove them from the final - makefiles but this must be avoid ! - In fact, the generated makefile would then contain something like: - - MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \ - WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \ - WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \ - USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ - USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" - - - where $(WX_DIR), $(WX_VERSION), ... expand to nothing since they are - undeclared variables from MAKE's point of view... - - --> - <if cond="TARGETING_WIN32=='1'"> <set var="VARS_DONT_ELIMINATE" append="1"> WX_DIR WX_VERSION WX_SHARED USE_WXLUASOCKETLIB USE_WXLUADEBUGLIB --- 30,36 ---- <if cond="TARGETING_WIN32=='1'"> + + <!-- We need to have these variables defined when calling the subproject makefiles ! --> <set var="VARS_DONT_ELIMINATE" append="1"> WX_DIR WX_VERSION WX_SHARED USE_WXLUASOCKETLIB USE_WXLUADEBUGLIB *************** *** 60,63 **** --- 43,84 ---- <!-- ================================================================== --> + <!-- AUXILIARY TARGETS --> + <!-- ================================================================== --> + + <if cond="FORMAT!='autoconf'"> + <set var="WXLUA_BASEDIR">../../..</set> + <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'"> + <!-- top_builddir already ends with '/' --> + <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"> + <dependency-of>all</dependency-of> + <dir>$(WXLUA_DLLOUTPUT_PATH)</dir> + </mkdir> + <mkdir id="setupbindir"> + <dependency-of>all</dependency-of> + <dir>$(WXLUA_BINOUTPUT_PATH)</dir> + </mkdir> + </if> + + + <!-- ================================================================== --> <!-- The utils --> <!-- ================================================================== --> *************** *** 66,70 **** <installable>yes</installable> <dependency-of>all</dependency-of> ! <dir>$(WXLUA_BASEDIR)$(DIRSEP)util$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> </subproject> --- 87,91 ---- <installable>yes</installable> <dependency-of>all</dependency-of> ! <dir>$(WXLUA_BASEDIR)/util/$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> </subproject> *************** *** 78,82 **** <installable>yes</installable> <dependency-of>all</dependency-of> ! <dir>$(WXLUA_BASEDIR)$(DIRSEP)modules$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> </subproject> --- 99,103 ---- <installable>yes</installable> <dependency-of>all</dependency-of> ! <dir>$(WXLUA_BASEDIR)/modules/$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> </subproject> *************** *** 90,94 **** <installable>yes</installable> <dependency-of>all</dependency-of> ! <dir>$(WXLUA_BASEDIR)$(DIRSEP)apps$(DIRSEP)$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> </subproject> --- 111,115 ---- <installable>yes</installable> <dependency-of>all</dependency-of> ! <dir>$(WXLUA_BASEDIR)/apps/$(SUBPROJECT_POSTFIX_PATH)</dir> <target/> </subproject> *************** *** 103,115 **** </pkgconfig> ! <!-- <action id="docs"> <command>@echo =============================================</command> ! <command>@echo Creating wxArt2d docs using doxygen... </command> <command>@echo =============================================</command> ! <command>cd ..\..\doc</command> ! <command>doxygen doxygen.inc</command> </action> - --> </makefile> --- 124,146 ---- </pkgconfig> ! <!-- This is not an 'all' dependency; it's a separed target to be called explicitely --> <action id="docs"> <command>@echo =============================================</command> ! <command>@echo Creating wxLua documentation using doxygen...</command> <command>@echo =============================================</command> ! ! <if cond="TARGETING_WIN32=='1'"> ! <command>cd $(WXLUA_BASEDIR)\docs</command> ! <command>doxygen doxygen.cfg</command> ! </if> ! <if cond="TARGETING_WIN32=='0'"> ! <!-- ! The DOC tree is not copied by configure when using a ! build folder different from the root folder of the project ! ! Thus we need to build docs directly in the source tree... ! --> ! <command>( cd $(top_srcdir)/docs && doxygen doxygen.cfg )</command> ! </if> </action> </makefile> |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:07
|
Update of /cvsroot/wxlua/wxLua/util/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/util/build/bakefiles Modified Files: util.bkl Log Message: fixed top_builddir problems Index: util.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/bakefiles/util.bkl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** util.bkl 25 Jan 2006 18:35:59 -0000 1.7 --- util.bkl 27 Jan 2006 21:57:14 -0000 1.8 *************** *** 30,34 **** <!-- our base path --> <if cond="TARGETING_WIN32=='1'"> ! <set var="UTIL_BASEDIR">..$(DIRSEP)..</set> </if> <if cond="TARGETING_WIN32=='0'"> --- 30,36 ---- <!-- our base path --> <if cond="TARGETING_WIN32=='1'"> ! <set var="UTIL_BASEDIR">../..</set> ! <set var="WXLUA_BASEDIR">$(UTIL_BASEDIR)/..</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set> </if> <if cond="TARGETING_WIN32=='0'"> *************** *** 38,41 **** --- 40,44 ---- --> <set var="UTIL_BASEDIR">$(top_srcdir)/util</set> + <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set> </if> <set var="SRCDIR">$(UTIL_BASEDIR)</set> *************** *** 49,53 **** <exe id="util_bin2c" cond="USE_BIN2C=='1'"> <exename>bin2c</exename> ! <dirname>$(UTIL_BASEDIR)$(DIRSEP)..$(DIRSEP)bin</dirname> <install-to>$(BINDIR)</install-to> <sources>bin2c/bin2c.c</sources> --- 52,56 ---- <exe id="util_bin2c" cond="USE_BIN2C=='1'"> <exename>bin2c</exename> ! <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <install-to>$(BINDIR)</install-to> <sources>bin2c/bin2c.c</sources> |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:07
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/build/autoconf Modified Files: wxpresets.m4 Log Message: fixed top_builddir problems Index: wxpresets.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/wxpresets.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxpresets.m4 23 Jan 2006 19:38:29 -0000 1.3 --- wxpresets.m4 27 Jan 2006 21:57:06 -0000 1.4 *************** *** 177,186 **** dnl be sure that the WX_VERSION macro has the same format of the WX_VERSION option dnl which is used by wx_win32.bkl (i.e. 25, 26, 27... instead of 2.5.x, 2.6.x, 2.7.x...) ! wx_config_major_version=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ! wx_config_minor_version=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` WX_VERSION=$wx_config_major_version$wx_config_minor_version dnl FOR DEBUG ONLY --- 177,190 ---- dnl be sure that the WX_VERSION macro has the same format of the WX_VERSION option dnl which is used by wx_win32.bkl (i.e. 25, 26, 27... instead of 2.5.x, 2.6.x, 2.7.x...) ! WX_VERSION_MAJOR=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ! WX_VERSION_MINOR=`echo $WX_VERSION | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` WX_VERSION=$wx_config_major_version$wx_config_minor_version + dnl these are required ! + AC_SUBST(WX_VERSION_MAJOR) + AC_SUBST(WX_VERSION_MINOR) + dnl FOR DEBUG ONLY *************** *** 307,310 **** --- 311,316 ---- ]) fi + AC_SUBST(WX_PORT) + AC_SUBST(WX_GTKPORT_VERSION) ]) *************** *** 339,343 **** echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT" fi ! echo " - VERSION: $WX_VERSION" if test "$WX_PORT" = "gtk"; then --- 345,349 ---- echo " Error in this configure script ! Please contact $PACKAGE_BUGREPORT" fi ! echo " - VERSION: $WX_VERSION_MAJOR.$WX_VERSION_MINOR" if test "$WX_PORT" = "gtk"; then |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:07
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/modules Modified Files: Makefile.in Log Message: fixed top_builddir problems Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile.in 25 Jan 2006 19:13:19 -0000 1.17 --- Makefile.in 27 Jan 2006 21:57:09 -0000 1.18 *************** *** 41,44 **** --- 41,47 ---- WX_CXXFLAGS = @WX_CXXFLAGS@ WX_LIBS = @WX_LIBS@ + WX_PORT = @WX_PORT@ + WX_VERSION_MAJOR = @WX_VERSION_MAJOR@ + WX_VERSION_MINOR = @WX_VERSION_MINOR@ ### Variables: ### *************** *** 79,84 **** MOD_LUA_OBJECTS = \ mod_lua_lua.o ! WXLUA_LIB_CXXFLAGS = -I$(top_srcdir)/modules $(WX_CXXFLAGS) $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ wxlua_lib_wxlcallb.o \ --- 82,87 ---- MOD_LUA_OBJECTS = \ mod_lua_lua.o ! WXLUA_LIB_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ wxlua_lib_wxlcallb.o \ *************** *** 87,92 **** wxlua_lib_internal.o \ wxlua_lib_wxlintrp.o ! WXLUA_DLL_CXXFLAGS = -I$(top_srcdir)/modules -DWXLUA_MAKINGDLL $(PIC_FLAG) \ ! $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ wxlua_dll_wxlcallb.o \ --- 90,95 ---- wxlua_lib_internal.o \ wxlua_lib_wxlintrp.o ! WXLUA_DLL_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -DWXLUA_MAKINGDLL $(PIC_FLAG) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ wxlua_dll_wxlcallb.o \ *************** *** 213,219 **** @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_PLATFORM_MAC_1@__mod_lua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_srcdir)/bin/lua$(EXEEXT) ! @COND_WX_SHARED_0@__wxlua_lib___depname = \ ! @COND_WX_SHARED_0@ $(top_srcdir)/lib/$(LIBPREFIX)wxlua$(LIBEXT) @COND_WX_SHARED_0@__install_wxlua_lib___depname = install_wxlua_lib @COND_WX_SHARED_0@__uninstall_wxlua_lib___depname = uninstall_wxlua_lib --- 216,223 ---- @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_PLATFORM_MAC_1@__mod_lua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_builddir)bin/lua$(EXEEXT) ! COND_WX_SHARED_0___wxlua_lib___depname = \ ! $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! @COND_WX_SHARED_0@__wxlua_lib___depname = $(COND_WX_SHARED_0___wxlua_lib___depname) @COND_WX_SHARED_0@__install_wxlua_lib___depname = install_wxlua_lib @COND_WX_SHARED_0@__uninstall_wxlua_lib___depname = uninstall_wxlua_lib *************** *** 223,227 **** @COND_WX_SHARED_0@ = uninstall_wxlua_lib_headers @COND_WX_SHARED_1@__wxlua_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_srcdir)/lib/$(DLLPREFIX)wxlua_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxlua_dll___depname = install_wxlua_dll @COND_WX_SHARED_1@__uninstall_wxlua_dll___depname = uninstall_wxlua_dll --- 227,231 ---- @COND_WX_SHARED_0@ = uninstall_wxlua_lib_headers @COND_WX_SHARED_1@__wxlua_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxlua_dll___depname = install_wxlua_dll @COND_WX_SHARED_1@__uninstall_wxlua_dll___depname = uninstall_wxlua_dll *************** *** 233,256 **** @COND_USE_SOVERSOLARIS_1@__wxlua_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wx_4) ! COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd = (cd $(top_srcdir)/lib/; \ ! rm -f $(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) $(DLLPREFIX)wxlua_dll$(__wx); \ ! $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx_4) $(DLLPREFIX)wxlua_dll$(__wx); \ ! $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx) $(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxlua_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_inst_cmd = rm -f \ ! $(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxlua_dll$(__wx_4) $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxlua_dll$(__wx) $(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__wxlua_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_inst_cmd) ! @COND_PLATFORM_OS2_1@__wxlua_dll___importlib = -import \ ! @COND_PLATFORM_OS2_1@ $(top_srcdir)/lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) ! @COND_WINDOWS_IMPLIB_1@__wxlua_dll___importlib = \ ! @COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib,$(top_srcdir)/lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) @COND_WX_SHARED_1@__install_wxlua_dll_headers___depname = \ @COND_WX_SHARED_1@ install_wxlua_dll_headers @COND_WX_SHARED_1@__uninstall_wxlua_dll_headers___depname \ @COND_WX_SHARED_1@ = uninstall_wxlua_dll_headers ! @COND_WX_SHARED_0@__wxbind_lib___depname = \ ! @COND_WX_SHARED_0@ $(top_srcdir)/lib/$(LIBPREFIX)wxbind$(LIBEXT) @COND_WX_SHARED_0@__install_wxbind_lib___depname = install_wxbind_lib @COND_WX_SHARED_0@__uninstall_wxbind_lib___depname = uninstall_wxbind_lib --- 237,266 ---- @COND_USE_SOVERSOLARIS_1@__wxlua_dll___soname_flags \ @COND_USE_SOVERSOLARIS_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxlua_dll$(__wx_4) ! COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)lib/; rm -f \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx_4) \ ! $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx) \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxlua_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_inst_cmd = rm -f \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx_4) \ ! $(DLLPREFIX)wxlua_dll$(__wx); $(LN_S) $(DLLPREFIX)wxlua_dll$(__wx) \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__wxlua_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxlua_dll___so_symlinks_inst_cmd) ! COND_PLATFORM_OS2_1___wxlua_dll___importlib = -import \ ! $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_PLATFORM_OS2_1@__wxlua_dll___importlib = $(COND_PLATFORM_OS2_1___wxlua_dll___importlib) ! COND_WINDOWS_IMPLIB_1___wxlua_dll___importlib = \ ! -Wl,--out-implib,$(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_WINDOWS_IMPLIB_1@__wxlua_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxlua_dll___importlib) @COND_WX_SHARED_1@__install_wxlua_dll_headers___depname = \ @COND_WX_SHARED_1@ install_wxlua_dll_headers @COND_WX_SHARED_1@__uninstall_wxlua_dll_headers___depname \ @COND_WX_SHARED_1@ = uninstall_wxlua_dll_headers ! COND_WX_SHARED_0___wxbind_lib___depname = \ ! $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! @COND_WX_SHARED_0@__wxbind_lib___depname = $(COND_WX_SHARED_0___wxbind_lib___depname) @COND_WX_SHARED_0@__install_wxbind_lib___depname = install_wxbind_lib @COND_WX_SHARED_0@__uninstall_wxbind_lib___depname = uninstall_wxbind_lib *************** *** 260,264 **** @COND_WX_SHARED_0@ = uninstall_wxbind_lib_headers @COND_WX_SHARED_1@__wxbind_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_srcdir)/lib/$(DLLPREFIX)wxbind_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxbind_dll___depname = install_wxbind_dll @COND_WX_SHARED_1@__uninstall_wxbind_dll___depname = uninstall_wxbind_dll --- 270,274 ---- @COND_WX_SHARED_0@ = uninstall_wxbind_lib_headers @COND_WX_SHARED_1@__wxbind_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxbind_dll___depname = install_wxbind_dll @COND_WX_SHARED_1@__uninstall_wxbind_dll___depname = uninstall_wxbind_dll *************** *** 271,294 **** @COND_USE_SOVERSOLARIS_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxbind_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd = (cd \ ! $(top_srcdir)/lib/; rm -f $(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx_4) \ $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx) \ ! $(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxbind_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_inst_cmd = rm -f \ ! $(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxbind_dll$(__wx_4) $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) \ ! $(DLLPREFIX)wxbind_dll$(__wx) $(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__wxbind_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_inst_cmd) ! @COND_PLATFORM_OS2_1@__wxbind_dll___importlib = -import \ ! @COND_PLATFORM_OS2_1@ $(top_srcdir)/lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) ! @COND_WINDOWS_IMPLIB_1@__wxbind_dll___importlib = \ ! @COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib,$(top_srcdir)/lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) @COND_WX_SHARED_1@__install_wxbind_dll_headers___depname \ @COND_WX_SHARED_1@ = install_wxbind_dll_headers @COND_WX_SHARED_1@__uninstall_wxbind_dll_headers___depname \ @COND_WX_SHARED_1@ = uninstall_wxbind_dll_headers ! @COND_WX_SHARED_0@__wxluadebug_lib___depname = \ ! @COND_WX_SHARED_0@ $(top_srcdir)/lib/$(LIBPREFIX)wxluadebug$(LIBEXT) @COND_WX_SHARED_0@__install_wxluadebug_lib___depname = \ @COND_WX_SHARED_0@ install_wxluadebug_lib --- 281,309 ---- @COND_USE_SOVERSOLARIS_1@ = $(SONAME_FLAG)$(DLLPREFIX)wxbind_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)lib/; rm -f \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx_4) \ $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx) \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxbind_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_inst_cmd = rm -f \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ ! $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx_4) \ ! $(DLLPREFIX)wxbind_dll$(__wx); $(LN_S) $(DLLPREFIX)wxbind_dll$(__wx) \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__wxbind_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxbind_dll___so_symlinks_inst_cmd) ! COND_PLATFORM_OS2_1___wxbind_dll___importlib = -import \ ! $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_PLATFORM_OS2_1@__wxbind_dll___importlib = $(COND_PLATFORM_OS2_1___wxbind_dll___importlib) ! COND_WINDOWS_IMPLIB_1___wxbind_dll___importlib = \ ! -Wl,--out-implib,$(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_WINDOWS_IMPLIB_1@__wxbind_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxbind_dll___importlib) @COND_WX_SHARED_1@__install_wxbind_dll_headers___depname \ @COND_WX_SHARED_1@ = install_wxbind_dll_headers @COND_WX_SHARED_1@__uninstall_wxbind_dll_headers___depname \ @COND_WX_SHARED_1@ = uninstall_wxbind_dll_headers ! COND_WX_SHARED_0___wxluadebug_lib___depname = \ ! $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! @COND_WX_SHARED_0@__wxluadebug_lib___depname = $(COND_WX_SHARED_0___wxluadebug_lib___depname) @COND_WX_SHARED_0@__install_wxluadebug_lib___depname = \ @COND_WX_SHARED_0@ install_wxluadebug_lib *************** *** 300,304 **** @COND_WX_SHARED_0@ = uninstall_wxluadebug_lib_headers @COND_WX_SHARED_1@__wxluadebug_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_srcdir)/lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxluadebug_dll___depname = \ @COND_WX_SHARED_1@ install_wxluadebug_dll --- 315,319 ---- @COND_WX_SHARED_0@ = uninstall_wxluadebug_lib_headers @COND_WX_SHARED_1@__wxluadebug_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxluadebug_dll___depname = \ @COND_WX_SHARED_1@ install_wxluadebug_dll *************** *** 314,342 **** @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluadebug_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd = (cd \ ! $(top_srcdir)/lib/; rm -f $(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluadebug_dll$(__wx); $(LN_S) \ $(DLLPREFIX)wxluadebug_dll$(__wx_4) $(DLLPREFIX)wxluadebug_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluadebug_dll$(__wx) \ ! $(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxluadebug_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_inst_cmd = rm -f \ ! $(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluadebug_dll$(__wx); $(LN_S) \ $(DLLPREFIX)wxluadebug_dll$(__wx_4) $(DLLPREFIX)wxluadebug_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluadebug_dll$(__wx) \ ! $(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__wxluadebug_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_inst_cmd) ! @COND_PLATFORM_OS2_1@__wxluadebug_dll___importlib = \ ! @COND_PLATFORM_OS2_1@ -import \ ! @COND_PLATFORM_OS2_1@ $(top_srcdir)/lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) ! @COND_WINDOWS_IMPLIB_1@__wxluadebug_dll___importlib \ ! @COND_WINDOWS_IMPLIB_1@ = \ ! @COND_WINDOWS_IMPLIB_1@ -Wl,--out-implib,$(top_srcdir)/lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) @COND_WX_SHARED_1@__install_wxluadebug_dll_headers___depname \ @COND_WX_SHARED_1@ = install_wxluadebug_dll_headers @COND_WX_SHARED_1@__uninstall_wxluadebug_dll_headers___depname \ @COND_WX_SHARED_1@ = uninstall_wxluadebug_dll_headers ! @COND_WX_SHARED_0@__wxluasocket_lib___depname = \ ! @COND_WX_SHARED_0@ $(top_srcdir)/lib/$(LIBPREFIX)wxluasocket$(LIBEXT) @COND_WX_SHARED_0@__install_wxluasocket_lib___depname = \ @COND_WX_SHARED_0@ install_wxluasocket_lib --- 329,359 ---- @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluadebug_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)lib/; rm -f \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluadebug_dll$(__wx); $(LN_S) \ $(DLLPREFIX)wxluadebug_dll$(__wx_4) $(DLLPREFIX)wxluadebug_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluadebug_dll$(__wx) \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxluadebug_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_inst_cmd = rm -f \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluadebug_dll$(__wx); $(LN_S) \ $(DLLPREFIX)wxluadebug_dll$(__wx_4) $(DLLPREFIX)wxluadebug_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluadebug_dll$(__wx) \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__wxluadebug_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxluadebug_dll___so_symlinks_inst_cmd) ! COND_PLATFORM_OS2_1___wxluadebug_dll___importlib = -import \ ! $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_PLATFORM_OS2_1@__wxluadebug_dll___importlib = $(COND_PLATFORM_OS2_1___wxluadebug_dll___importlib) ! COND_WINDOWS_IMPLIB_1___wxluadebug_dll___importlib = \ ! -Wl,--out-implib,$(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_WINDOWS_IMPLIB_1@__wxluadebug_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxluadebug_dll___importlib) @COND_WX_SHARED_1@__install_wxluadebug_dll_headers___depname \ @COND_WX_SHARED_1@ = install_wxluadebug_dll_headers @COND_WX_SHARED_1@__uninstall_wxluadebug_dll_headers___depname \ @COND_WX_SHARED_1@ = uninstall_wxluadebug_dll_headers ! COND_WX_SHARED_0___wxluasocket_lib___depname = \ ! $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! @COND_WX_SHARED_0@__wxluasocket_lib___depname = $(COND_WX_SHARED_0___wxluasocket_lib___depname) @COND_WX_SHARED_0@__install_wxluasocket_lib___depname = \ @COND_WX_SHARED_0@ install_wxluasocket_lib *************** *** 348,352 **** @COND_WX_SHARED_0@ = uninstall_wxluasocket_lib_headers @COND_WX_SHARED_1@__wxluasocket_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_srcdir)/lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxluasocket_dll___depname = \ @COND_WX_SHARED_1@ install_wxluasocket_dll --- 365,369 ---- @COND_WX_SHARED_0@ = uninstall_wxluasocket_lib_headers @COND_WX_SHARED_1@__wxluasocket_dll___depname = \ ! @COND_WX_SHARED_1@ $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4) @COND_WX_SHARED_1@__install_wxluasocket_dll___depname = \ @COND_WX_SHARED_1@ install_wxluasocket_dll *************** *** 362,383 **** @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluasocket_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd = (cd \ ! $(top_srcdir)/lib/; rm -f $(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluasocket_dll$(__wx); $(LN_S) \ $(DLLPREFIX)wxluasocket_dll$(__wx_4) $(DLLPREFIX)wxluasocket_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluasocket_dll$(__wx) \ ! $(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxluasocket_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_inst_cmd = rm -f \ ! $(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluasocket_dll$(__wx); $(LN_S) \ $(DLLPREFIX)wxluasocket_dll$(__wx_4) $(DLLPREFIX)wxluasocket_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluasocket_dll$(__wx) \ ! $(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__wxluasocket_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_inst_cmd) ! @COND_PLATFORM_OS2_1@__wxluasocket_dll___importlib = \ ! @COND_PLATFORM_OS2_1@ -import \ ! @COND_PLATFORM_OS2_1@ $(top_srcdir)/lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) COND_WINDOWS_IMPLIB_1___wxluasocket_dll___importlib = \ ! -Wl,--out-implib,$(top_srcdir)/lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxluasocket_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxluasocket_dll___importlib) @COND_WX_SHARED_1@__install_wxluasocket_dll_headers___depname \ --- 379,401 ---- @COND_USE_SOVERSOLARIS_1@ $(SONAME_FLAG)$(DLLPREFIX)wxluasocket_dll$(__wx_4) COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd = (cd \ ! $(top_builddir)lib/; rm -f \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluasocket_dll$(__wx); $(LN_S) \ $(DLLPREFIX)wxluasocket_dll$(__wx_4) $(DLLPREFIX)wxluasocket_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluasocket_dll$(__wx) \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX)) @COND_USE_SOSYMLINKS_1@__wxluasocket_dll___so_symlinks_cmd = $(COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_cmd) COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_inst_cmd = rm -f \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) \ $(DLLPREFIX)wxluasocket_dll$(__wx); $(LN_S) \ $(DLLPREFIX)wxluasocket_dll$(__wx_4) $(DLLPREFIX)wxluasocket_dll$(__wx); \ $(LN_S) $(DLLPREFIX)wxluasocket_dll$(__wx) \ ! $(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_USE_SOSYMLINKS_1@__wxluasocket_dll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___wxluasocket_dll___so_symlinks_inst_cmd) ! COND_PLATFORM_OS2_1___wxluasocket_dll___importlib = -import \ ! $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! @COND_PLATFORM_OS2_1@__wxluasocket_dll___importlib = $(COND_PLATFORM_OS2_1___wxluasocket_dll___importlib) COND_WINDOWS_IMPLIB_1___wxluasocket_dll___importlib = \ ! -Wl,--out-implib,$(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WINDOWS_IMPLIB_1@__wxluasocket_dll___importlib = $(COND_WINDOWS_IMPLIB_1___wxluasocket_dll___importlib) @COND_WX_SHARED_1@__install_wxluasocket_dll_headers___depname \ *************** *** 399,403 **** ### Targets: ### ! all: $(top_srcdir)/lib/$(LIBPREFIX)lua$(LIBEXT) $(top_srcdir)/bin/lua$(EXEEXT) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) install: all install_mod_lua_lib install_mod_lua_lib_headers install_mod_lua $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbind_lib___depname) $(__install_wxbind_lib_headers___depname) $(__install_wxbind_dll___depname) $(__install_wxbind_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) --- 417,421 ---- ### Targets: ### ! all: $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(top_builddir)bin/lua$(EXEEXT) $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) install: all install_mod_lua_lib install_mod_lua_lib_headers install_mod_lua $(__install_wxlua_lib___depname) $(__install_wxlua_lib_headers___depname) $(__install_wxlua_dll___depname) $(__install_wxlua_dll_headers___depname) $(__install_wxbind_lib___depname) $(__install_wxbind_lib_headers___depname) $(__install_wxbind_dll___depname) $(__install_wxbind_dll_headers___depname) $(__install_wxluadebug_lib___depname) $(__install_wxluadebug_lib_headers___depname) $(__install_wxluadebug_dll___depname) $(__install_wxluadebug_dll_headers___depname) $(__install_wxluasocket_lib___depname) $(__install_wxluasocket_lib_headers___depname) $(__install_wxluasocket_dll___depname) $(__install_wxluasocket_dll_headers___depname) *************** *** 415,441 **** rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)lua$(LIBEXT) ! rm -f $(top_srcdir)/bin/lua$(EXEEXT) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxlua$(LIBEXT) ! rm -f $(top_srcdir)/lib/$(DLLPREFIX)wxlua_dll$(__wx_4) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) $(top_srcdir)/lib/$(DLLPREFIX)wxlua_dll$(__wx) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxbind$(LIBEXT) ! rm -f $(top_srcdir)/lib/$(DLLPREFIX)wxbind_dll$(__wx_4) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) $(top_srcdir)/lib/$(DLLPREFIX)wxbind_dll$(__wx) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxluadebug$(LIBEXT) ! rm -f $(top_srcdir)/lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) $(top_srcdir)/lib/$(DLLPREFIX)wxluadebug_dll$(__wx) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxluasocket$(LIBEXT) ! rm -f $(top_srcdir)/lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) ! rm -f $(top_srcdir)/lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) $(top_srcdir)/lib/$(DLLPREFIX)wxluasocket_dll$(__wx) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_srcdir)/lib/$(LIBPREFIX)lua$(LIBEXT): $(MOD_LUA_LIB_OBJECTS) rm -f $@ $(AR) rcu $@ $(MOD_LUA_LIB_OBJECTS) --- 433,459 ---- rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)bin/lua$(EXEEXT) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_4) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_4) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! rm -f $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) ! rm -f $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT): $(MOD_LUA_LIB_OBJECTS) rm -f $@ $(AR) rcu $@ $(MOD_LUA_LIB_OBJECTS) *************** *** 444,451 **** install_mod_lua_lib: $(INSTALL_DIR) $(DESTDIR)$(libdir) ! $(INSTALL_DATA) $(top_srcdir)/lib/$(LIBPREFIX)lua$(LIBEXT) $(DESTDIR)$(libdir) uninstall_mod_lua_lib: ! rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)lua$(LIBEXT) install_mod_lua_lib_headers: --- 462,469 ---- install_mod_lua_lib: $(INSTALL_DIR) $(DESTDIR)$(libdir) ! $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(DESTDIR)$(libdir) uninstall_mod_lua_lib: ! rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) install_mod_lua_lib_headers: *************** *** 463,468 **** done ! $(top_srcdir)/bin/lua$(EXEEXT): $(MOD_LUA_OBJECTS) $(top_srcdir)/lib/$(LIBPREFIX)lua$(LIBEXT) ! $(CC) -o $@ $(MOD_LUA_OBJECTS) -L$(top_srcdir)/lib $(LDFLAGS) -llua -lm $(__mod_lua___mac_setfilecmd) --- 481,486 ---- done ! $(top_builddir)bin/lua$(EXEEXT): $(MOD_LUA_OBJECTS) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) ! $(CC) -o $@ $(MOD_LUA_OBJECTS) -L$(top_builddir)lib $(LDFLAGS) -lwxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lm $(__mod_lua___mac_setfilecmd) *************** *** 470,479 **** install_mod_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_srcdir)/bin/lua$(EXEEXT) $(DESTDIR)$(bindir) uninstall_mod_lua: rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) ! @COND_WX_SHARED_0@$(top_srcdir)/lib/$(LIBPREFIX)wxlua$(LIBEXT): $(WXLUA_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXLUA_LIB_OBJECTS) --- 488,497 ---- install_mod_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_builddir)bin/lua$(EXEEXT) $(DESTDIR)$(bindir) uninstall_mod_lua: rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) ! @COND_WX_SHARED_0@$(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT): $(WXLUA_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXLUA_LIB_OBJECTS) *************** *** 482,489 **** @COND_WX_SHARED_0@install_wxlua_lib: @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_srcdir)/lib/$(LIBPREFIX)wxlua$(LIBEXT) $(DESTDIR)$(libdir) @COND_WX_SHARED_0@uninstall_wxlua_lib: ! @COND_WX_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua$(LIBEXT) @COND_WX_SHARED_0@install_wxlua_lib_headers: --- 500,507 ---- @COND_WX_SHARED_0@install_wxlua_lib: @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(DESTDIR)$(libdir) @COND_WX_SHARED_0@uninstall_wxlua_lib: ! @COND_WX_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) @COND_WX_SHARED_0@install_wxlua_lib_headers: *************** *** 501,505 **** @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_srcdir)/lib/$(DLLPREFIX)wxlua_dll$(__wx_4): $(WXLUA_DLL_OBJECTS) @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___macinstnamecmd) $(__wxlua_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxlua_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ --- 519,523 ---- @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_4): $(WXLUA_DLL_OBJECTS) @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUA_DLL_OBJECTS) $(LDFLAGS) $(__wxlua_dll___macinstnamecmd) $(__wxlua_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxlua_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ *************** *** 508,517 **** @COND_WX_SHARED_1@install_wxlua_dll: @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_srcdir)/lib/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_srcdir)/lib/$(DLLPREFIX)wxlua_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxlua_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxlua_dll: ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua.$(DLLIMP_SUFFIX) @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_dll$(__wx_4) --- 526,535 ---- @COND_WX_SHARED_1@install_wxlua_dll: @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxlua_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxlua_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxlua_dll: ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxlua_dll$(__wx_4) *************** *** 530,534 **** @COND_WX_SHARED_1@ done ! @COND_WX_SHARED_0@$(top_srcdir)/lib/$(LIBPREFIX)wxbind$(LIBEXT): $(WXBIND_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXBIND_LIB_OBJECTS) --- 548,552 ---- @COND_WX_SHARED_1@ done ! @COND_WX_SHARED_0@$(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT): $(WXBIND_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXBIND_LIB_OBJECTS) *************** *** 537,544 **** @COND_WX_SHARED_0@install_wxbind_lib: @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_srcdir)/lib/$(LIBPREFIX)wxbind$(LIBEXT) $(DESTDIR)$(libdir) @COND_WX_SHARED_0@uninstall_wxbind_lib: ! @COND_WX_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxbind$(LIBEXT) @COND_WX_SHARED_0@install_wxbind_lib_headers: --- 555,562 ---- @COND_WX_SHARED_0@install_wxbind_lib: @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(DESTDIR)$(libdir) @COND_WX_SHARED_0@uninstall_wxbind_lib: ! @COND_WX_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) @COND_WX_SHARED_0@install_wxbind_lib_headers: *************** *** 556,560 **** @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_srcdir)/lib/$(DLLPREFIX)wxbind_dll$(__wx_4): $(WXBIND_DLL_OBJECTS) @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) $(__wxbind_dll___macinstnamecmd) $(__wxbind_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxbind_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ --- 574,578 ---- @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_4): $(WXBIND_DLL_OBJECTS) @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXBIND_DLL_OBJECTS) $(LDFLAGS) $(__wxbind_dll___macinstnamecmd) $(__wxbind_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxbind_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ *************** *** 563,572 **** @COND_WX_SHARED_1@install_wxbind_dll: @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_srcdir)/lib/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_srcdir)/lib/$(DLLPREFIX)wxbind_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbind_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxbind_dll: ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxbind.$(DLLIMP_SUFFIX) @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxbind_dll$(__wx_4) --- 581,590 ---- @COND_WX_SHARED_1@install_wxbind_dll: @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxbind_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxbind_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxbind_dll: ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxbind_dll$(__wx_4) *************** *** 585,589 **** @COND_WX_SHARED_1@ done ! @COND_WX_SHARED_0@$(top_srcdir)/lib/$(LIBPREFIX)wxluadebug$(LIBEXT): $(WXLUADEBUG_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXLUADEBUG_LIB_OBJECTS) --- 603,607 ---- @COND_WX_SHARED_1@ done ! @COND_WX_SHARED_0@$(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT): $(WXLUADEBUG_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXLUADEBUG_LIB_OBJECTS) *************** *** 592,599 **** @COND_WX_SHARED_0@install_wxluadebug_lib: @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_srcdir)/lib/$(LIBPREFIX)wxluadebug$(LIBEXT) $(DESTDIR)$(libdir) @COND_WX_SHARED_0@uninstall_wxluadebug_lib: ! @COND_WX_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxluadebug$(LIBEXT) @COND_WX_SHARED_0@install_wxluadebug_lib_headers: --- 610,617 ---- @COND_WX_SHARED_0@install_wxluadebug_lib: @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(DESTDIR)$(libdir) @COND_WX_SHARED_0@uninstall_wxluadebug_lib: ! @COND_WX_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) @COND_WX_SHARED_0@install_wxluadebug_lib_headers: *************** *** 611,615 **** @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_srcdir)/lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4): $(WXLUADEBUG_DLL_OBJECTS) @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) $(__wxluadebug_dll___macinstnamecmd) $(__wxluadebug_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxluadebug_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ --- 629,633 ---- @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4): $(WXLUADEBUG_DLL_OBJECTS) @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUADEBUG_DLL_OBJECTS) $(LDFLAGS) $(__wxluadebug_dll___macinstnamecmd) $(__wxluadebug_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxluadebug_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ *************** *** 618,627 **** @COND_WX_SHARED_1@install_wxluadebug_dll: @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_srcdir)/lib/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_srcdir)/lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluadebug_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxluadebug_dll: ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxluadebug.$(DLLIMP_SUFFIX) @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluadebug_dll$(__wx_4) --- 636,645 ---- @COND_WX_SHARED_1@install_wxluadebug_dll: @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxluadebug_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluadebug_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxluadebug_dll: ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluadebug_dll$(__wx_4) *************** *** 640,644 **** @COND_WX_SHARED_1@ done ! @COND_WX_SHARED_0@$(top_srcdir)/lib/$(LIBPREFIX)wxluasocket$(LIBEXT): $(WXLUASOCKET_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXLUASOCKET_LIB_OBJECTS) --- 658,662 ---- @COND_WX_SHARED_1@ done ! @COND_WX_SHARED_0@$(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT): $(WXLUASOCKET_LIB_OBJECTS) @COND_WX_SHARED_0@ rm -f $@ @COND_WX_SHARED_0@ $(AR) rcu $@ $(WXLUASOCKET_LIB_OBJECTS) *************** *** 647,654 **** @COND_WX_SHARED_0@install_wxluasocket_lib: @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_srcdir)/lib/$(LIBPREFIX)wxluasocket$(LIBEXT) $(DESTDIR)$(libdir) @COND_WX_SHARED_0@uninstall_wxluasocket_lib: ! @COND_WX_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxluasocket$(LIBEXT) @COND_WX_SHARED_0@install_wxluasocket_lib_headers: --- 665,672 ---- @COND_WX_SHARED_0@install_wxluasocket_lib: @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) $(DESTDIR)$(libdir) @COND_WX_SHARED_0@uninstall_wxluasocket_lib: ! @COND_WX_SHARED_0@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)$(LIBEXT) @COND_WX_SHARED_0@install_wxluasocket_lib_headers: *************** *** 666,670 **** @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_srcdir)/lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4): $(WXLUASOCKET_DLL_OBJECTS) @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___macinstnamecmd) $(__wxluasocket_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxluasocket_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ --- 684,688 ---- @COND_WX_SHARED_0@ done ! @COND_WX_SHARED_1@$(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4): $(WXLUASOCKET_DLL_OBJECTS) @COND_WX_SHARED_1@ $(SHARED_LD_CXX) $@ $(WXLUASOCKET_DLL_OBJECTS) $(LDFLAGS) $(__wxluasocket_dll___macinstnamecmd) $(__wxluasocket_dll___soname_flags) $(__wx_5) -L$(top_srcdir)/lib $(__wxluasocket_dll___importlib) $(WX_LIBS) @COND_WX_SHARED_1@ *************** *** 673,682 **** @COND_WX_SHARED_1@install_wxluasocket_dll: @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_srcdir)/lib/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_srcdir)/lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluasocket_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxluasocket_dll: ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxluasocket.$(DLLIMP_SUFFIX) @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluasocket_dll$(__wx_4) --- 691,700 ---- @COND_WX_SHARED_1@install_wxluasocket_dll: @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_builddir)lib/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) ! @COND_WX_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)lib/$(DLLPREFIX)wxluasocket_dll$(__wx_4) $(DESTDIR)$(libdir) @COND_WX_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__wxluasocket_dll___so_symlinks_inst_cmd)) @COND_WX_SHARED_1@uninstall_wxluasocket_dll: ! @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)wxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).$(DLLIMP_SUFFIX) @COND_WX_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)wxluasocket_dll$(__wx_4) |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:03
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_lua.dsp modules_mod_lua_lib.dsp modules_mod_wxbind.dsp modules_mod_wxlua.dsp modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: fixed top_builddir problems Index: modules_mod_lua_lib.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_lua_lib.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** modules_mod_lua_lib.dsp 25 Jan 2006 18:35:58 -0000 1.6 --- modules_mod_lua_lib.dsp 27 Jan 2006 21:57:11 -0000 1.7 *************** *** 47,52 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 47,52 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 55,60 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode Release" --- 55,60 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Unicode Release" *************** *** 70,75 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 70,75 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 78,83 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Debug" --- 78,83 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Debug" *************** *** 93,98 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 93,98 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxmsw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxmsw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 101,106 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Release" --- 101,106 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxmsw26d_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxmsw26d_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 DLL Release" *************** *** 116,121 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 116,121 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxmsw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxmsw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXUSINGDLL" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 124,129 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Debug" --- 124,129 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxmsw26_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxmsw26_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Debug" *************** *** 139,144 **** # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 139,144 ---- # PROP Intermediate_Dir "msvc6prjud\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 147,152 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Release" --- 147,152 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Unicode Release" *************** *** 162,167 **** # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 162,167 ---- # PROP Intermediate_Dir "msvc6prju\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 170,175 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Debug" --- 170,175 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Debug" *************** *** 185,190 **** # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 185,190 ---- # PROP Intermediate_Dir "msvc6prjd\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxmsw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /W4 /Od /I "..\..\lua\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxmsw26d_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 193,198 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Release" --- 193,198 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxmsw26d_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libd\wxmsw26d_lua.lib" !ELSEIF "$(CFG)" == "mod_lua_lib - Win32 Release" *************** *** 208,213 **** # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 208,213 ---- # PROP Intermediate_Dir "msvc6prj\mod_lua_lib" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxmsw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /w /O2 /I "..\..\lua\include" /Fd..\..\..\lib\vc_lib\wxmsw26_lua.pdb /D "WIN32" /D "_LIB" /D "WXLUA_CODE" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 216,221 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\lua.lib" !ENDIF --- 216,221 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxmsw26_lua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_lib\wxmsw26_lua.lib" !ENDIF Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** makefile.bcc 25 Jan 2006 18:35:58 -0000 1.18 --- makefile.bcc 27 Jan 2006 21:57:11 -0000 1.19 *************** *** 122,126 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ ! -I..\..\..\modules -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ --- 122,127 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ ! -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ ! $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ *************** *** 133,138 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ ! -I..\..\..\modules -I$(WX_DIR)\contrib\include -DWXLUA_MAKINGDLL \ ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ --- 134,139 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_8) \ ! -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -DWXLUA_MAKINGDLL $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ *************** *** 279,283 **** !endif !if "$(WX_SHARED)" == "0" ! __wxlua_lib___depname = ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua.lib !endif !if "$(WX_SHARED)" == "1" --- 280,285 ---- !endif !if "$(WX_SHARED)" == "0" ! __wxlua_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib !endif !if "$(WX_SHARED)" == "1" *************** *** 291,295 **** !endif !if "$(WX_SHARED)" == "0" ! __wxbind_lib___depname = ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxbind.lib !endif !if "$(WX_SHARED)" == "1" --- 293,298 ---- !endif !if "$(WX_SHARED)" == "0" ! __wxbind_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib !endif !if "$(WX_SHARED)" == "1" *************** *** 304,308 **** !if "$(WX_SHARED)" == "0" __wxluadebug_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxluadebug.lib !endif !if "$(WX_SHARED)" == "1" --- 307,311 ---- !if "$(WX_SHARED)" == "0" __wxluadebug_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib !endif !if "$(WX_SHARED)" == "1" *************** *** 318,322 **** !if "$(WX_SHARED)" == "0" __wxluasocket_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxluasocket.lib !endif !if "$(WX_SHARED)" == "1" --- 321,325 ---- !if "$(WX_SHARED)" == "0" __wxluasocket_lib___depname = \ ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib !endif !if "$(WX_SHARED)" == "1" *************** *** 377,381 **** ### Targets: ### ! all: ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX) ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX) ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: --- 380,384 ---- ### Targets: ### ! all: ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ..\..\..\bin\lua.exe $(__wxlua_lib___depname) $(__wxlua_dll___depname) $(__wxbind_lib___depname) $(__wxbind_dll___depname) $(__wxluadebug_lib___depname) $(__wxluadebug_dll___depname) $(__wxluasocket_lib___depname) $(__wxluasocket_dll___depname) clean: *************** *** 383,387 **** -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\lua.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\lua.lib -if exist ..\..\..\bin\lua.exe del ..\..\..\bin\lua.exe -if exist ..\..\..\bin\lua.tds del ..\..\..\bin\lua.tds --- 386,390 ---- -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib -if exist ..\..\..\bin\lua.exe del ..\..\..\bin\lua.exe -if exist ..\..\..\bin\lua.tds del ..\..\..\bin\lua.tds *************** *** 390,394 **** -if exist ..\..\..\bin\lua.ilf del ..\..\..\bin\lua.ilf -if exist ..\..\..\bin\lua.ils del ..\..\..\bin\lua.ils ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.tds --- 393,397 ---- -if exist ..\..\..\bin\lua.ilf del ..\..\..\bin\lua.ilf -if exist ..\..\..\bin\lua.ils del ..\..\..\bin\lua.ils ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.tds *************** *** 397,402 **** -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxbind.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxbind.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.tds --- 400,405 ---- -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.tds *************** *** 405,410 **** -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxluadebug.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxluadebug.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.tds --- 408,413 ---- -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.tds *************** *** 413,418 **** -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxluasocket.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxluasocket.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.tds --- 416,421 ---- -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib ! -if exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.tds del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.tds *************** *** 421,433 **** -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket.lib ! ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX): ! if not exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX) mkdir ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX) ! ! ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX): ! if not exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX) mkdir ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX) ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\lua.lib: $(MOD_LUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 424,430 ---- -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ilf del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ilf -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ils del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.ils ! -if exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib del ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib: $(MOD_LUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 435,445 **** | ! ..\..\..\bin\lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\lua.lib ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____WX_DEBUG_8) @&&| ! c0x32.obj $(MOD_LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\lua.lib import32.lib cw32.lib,, | !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxlua.lib: $(WXLUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 432,442 ---- | ! ..\..\..\bin\lua.exe: $(MOD_LUA_OBJECTS) ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____WX_DEBUG_8) @&&| ! c0x32.obj $(MOD_LUA_OBJECTS),$@,, ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib import32.lib cw32.lib,, | !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib: $(WXLUA_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 451,461 **** ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxbind.lib: $(WXBIND_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 448,458 ---- ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxlua_dll.dll: $(WXLUA_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib: $(WXBIND_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 467,477 **** ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 464,474 ---- ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxbind_dll.dll: $(WXBIND_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib: $(WXLUADEBUG_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 483,493 **** ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxluasocket.lib: $(WXLUASOCKET_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| --- 480,490 ---- ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluadebug_dll.dll: $(WXLUADEBUG_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ !endif !if "$(WX_SHARED)" == "0" ! ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib: $(WXLUASOCKET_LIB_OBJECTS) if exist $@ del $@ tlib /a /p4096 $@ @&&| *************** *** 499,505 **** ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_3) @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket $@ !endif --- 496,502 ---- ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxluasocket_dll.dll: $(WXLUASOCKET_DLL_OBJECTS) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_8) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_3) @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32.lib,, | ! implib -f ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX)\wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ !endif Index: modules_mod_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxlua.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** modules_mod_wxlua.dsp 25 Jan 2006 18:35:58 -0000 1.6 --- modules_mod_wxlua.dsp 27 Jan 2006 21:57:12 -0000 1.7 *************** *** 48,63 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dllud\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dllud\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxmsw26ud_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllud\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxlua.lib" /debug ! # ADD LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxmsw26ud_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllud\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release" --- 48,63 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dllud\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dllud\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllud\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxmsw26ud_wxlua.lib" /debug ! # ADD LINK32 wxbase26ud.lib wxmsw26ud_core.lib wxbase26ud_xml.lib wxbase26ud_net.lib wxmsw26ud_adv.lib wxmsw26ud_media.lib wxmsw26ud_html.lib wxmsw26ud_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllud\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllud" /implib:"..\..\..\lib\vc_dllud\wxmsw26ud_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Unicode Release" *************** *** 73,88 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dllu\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dllu\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxmsw26u_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllu\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxlua.lib" ! # ADD LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxmsw26u_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllu\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug" --- 73,88 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dllu\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dllu\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllu\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxmsw26u_wxlua.lib" ! # ADD LINK32 wxbase26u.lib wxmsw26u_core.lib wxbase26u_xml.lib wxbase26u_net.lib wxmsw26u_adv.lib wxmsw26u_media.lib wxmsw26u_html.lib wxmsw26u_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dllu\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dllu" /implib:"..\..\..\lib\vc_dllu\wxmsw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Debug" *************** *** 98,113 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dlld\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dlld\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxmsw26d_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dlld\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxlua.lib" /debug ! # ADD LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxmsw26d_adv.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dlld\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release" --- 98,113 ---- # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dlld\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_dlld\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d "WXLUA_MAKINGDLL" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dlld\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxmsw26d_wxlua.lib" /debug ! # ADD LINK32 wxbase26d.lib wxmsw26d_core.lib wxbase26d_xml.lib wxbase26d_net.lib wxmsw26d_adv.lib wxmsw26d_media.lib wxmsw26d_html.lib wxmsw26d_xrc.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dlld\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dlld" /implib:"..\..\..\lib\vc_dlld\wxmsw26d_wxlua.lib" /debug !ELSEIF "$(CFG)" == "mod_wxlua - Win32 DLL Release" *************** *** 123,138 **** # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxmsw26_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" ! # ADD LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxmsw26_adv.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Debug" --- 123,138 ---- # PROP Intermediate_Dir "msvc6prj\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_dll\wxlua_dll.pdb /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /c # ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXLUA_MAKINGDLL" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /i "$(WXWIN)\contrib\include" /d WXLUA_MAKINGDLL BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe ! # ADD BASE LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxmsw26_wxlua.lib" ! # ADD LINK32 wxbase26.lib wxmsw26_core.lib wxbase26_xml.lib wxbase26_net.lib wxmsw26_adv.lib wxmsw26_media.lib wxmsw26_html.lib wxmsw26_xrc.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /nologo /dll /machine:i386 /out:"..\..\..\lib\vc_dll\wxlua_dll.dll" /libpath:"$(WXWIN)\lib\vc_dll" /libpath:"..\..\..\lib\vc_dll" /implib:"..\..\..\lib\vc_dll\wxmsw26_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Debug" *************** *** 148,153 **** # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 148,153 ---- # PROP Intermediate_Dir "msvc6prjud\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libud\wxmsw26ud_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 156,161 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Release" --- 156,161 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libud\wxmsw26ud_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Unicode Release" *************** *** 171,176 **** # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 --- 171,176 ---- # PROP Intermediate_Dir "msvc6prju\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /I "$(WXWIN)\contrib\include" /Fd..\..\..\lib\vc_libu\wxmsw26u_wxlua.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /D "__WXMSW__" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 *************** *** 179,184 **** # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Debug" --- 179,184 ---- # ADD BSC32 /nologo LIB32=link.exe -lib ! # ADD BASE LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_wxlua.lib" ! # ADD LIB32 /nologo /out:"..\..\..\lib\vc_libu\wxmsw26u_wxlua.lib" !ELSEIF "$(CFG)" == "mod_wxlua - Win32 Debug" *************** *** 194,199 **** # PROP Intermediate_Dir "msvc6prjd\mod_wxlua" # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua.pdb /D "WIN32" /D "_LIB" /D "__WXDEBUG__" /D "__WXMSW__" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I "$(WXWIN)\contrib\include" /Zi /Gm /GZ /Fd..\..\..\lib\vc_libd\wxlua.pdb /D "W... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:02
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/apps Modified Files: Makefile.in Log Message: fixed top_builddir problems Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile.in 25 Jan 2006 18:35:58 -0000 1.15 --- Makefile.in 27 Jan 2006 21:57:05 -0000 1.16 *************** *** 50,56 **** @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_USE_WXLUAAPP_1@__app_wxlua___depname = \ ! @COND_USE_WXLUAAPP_1@ $(top_srcdir)/bin/wxlua$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_srcdir)/bin/wxlua$(EXEEXT) COND_PLATFORM_OS2_1___app_wxlua___os2_emxbindcmd = $(NM) wxlua$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep wxlua$(EXEEXT) ; fi --- 50,56 ---- @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_USE_WXLUAAPP_1@__app_wxlua___depname = \ ! @COND_USE_WXLUAAPP_1@ $(top_builddir)bin/wxlua$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_builddir)bin/wxlua$(EXEEXT) COND_PLATFORM_OS2_1___app_wxlua___os2_emxbindcmd = $(NM) wxlua$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep wxlua$(EXEEXT) ; fi *************** *** 60,67 **** @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o @COND_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ ! @COND_USE_WXLUAEDITAPP_1@ = $(top_srcdir)/bin/wxluaedit$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_srcdir)/bin/wxluaedit$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluaedit___os2_emxbindcmd = $(NM) \ wxluaedit$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep wxluaedit$(EXEEXT) ; fi --- 60,67 ---- @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o @COND_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ ! @COND_USE_WXLUAEDITAPP_1@ = $(top_builddir)bin/wxluaedit$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)bin/wxluaedit$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluaedit___os2_emxbindcmd = $(NM) \ wxluaedit$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep wxluaedit$(EXEEXT) ; fi *************** *** 89,99 **** rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_srcdir)/bin/wxlua$(EXEEXT) ! rm -f $(top_srcdir)/bin/wxluaedit$(EXEEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_WXLUAAPP_1@$(top_srcdir)/bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) @COND_USE_WXLUAAPP_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxlua -lwxbind -llua $(WX_LIBS) @COND_USE_WXLUAAPP_1@ --- 89,99 ---- rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)bin/wxlua$(EXEEXT) ! rm -f $(top_builddir)bin/wxluaedit$(EXEEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_WXLUAAPP_1@$(top_builddir)bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) @COND_USE_WXLUAAPP_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxlua -lwxbind -llua $(WX_LIBS) @COND_USE_WXLUAAPP_1@ *************** *** 103,112 **** @COND_USE_WXLUAAPP_1@install_app_wxlua: @COND_USE_WXLUAAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAAPP_1@ $(INSTALL_PROGRAM) $(top_srcdir)/bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAAPP_1@uninstall_app_wxlua: @COND_USE_WXLUAAPP_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! @COND_USE_WXLUAEDITAPP_1@$(top_srcdir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) @COND_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua $(WX_LIBS) @COND_USE_WXLUAEDITAPP_1@ --- 103,112 ---- @COND_USE_WXLUAAPP_1@install_app_wxlua: @COND_USE_WXLUAAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAAPP_1@uninstall_app_wxlua: @COND_USE_WXLUAAPP_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! @COND_USE_WXLUAEDITAPP_1@$(top_builddir)bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) @COND_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua $(WX_LIBS) @COND_USE_WXLUAEDITAPP_1@ *************** *** 116,120 **** @COND_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_srcdir)/bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: --- 116,120 ---- @COND_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:02
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/apps/build/bakefiles Modified Files: apps.bkl Log Message: fixed top_builddir problems Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** apps.bkl 25 Jan 2006 18:35:58 -0000 1.16 --- apps.bkl 27 Jan 2006 21:57:05 -0000 1.17 *************** *** 21,26 **** --- 21,30 ---- <set var="WXLUA_BASEDIR">../../..</set> <set var="WXLUA_APPSDIR">../..</set> + <set var="SRCDIR">$(WXLUA_APPSDIR)</set> + <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set> </if> <if cond="TARGETING_WIN32=='0'"> + <set var="SRCDIR">.</set> + <!-- In this way we support makefiles created from folders != root folder; i.e. with this trick you can do: *************** *** 29,32 **** --- 33,37 ---- <set var="WXLUA_BASEDIR">$(top_srcdir)</set> <set var="WXLUA_APPSDIR">$(top_srcdir)/apps</set> + <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set> </if> *************** *** 36,41 **** <!-- ================================================================== --> - <set var="SRCDIR">$(WXLUA_APPSDIR.replace('$(top_srcdir)', '..'))</set> - <set var="WXLUAAPP_SRC">$(fileList('wxlua/src/*.cpp'))</set> <set var="WXLUAAPP_HDR">$(fileList('wxlua/src/*.h'))</set> --- 41,44 ---- *************** *** 62,71 **** as a module target... this would lead to problems when creating global DSW file... --> <exe id="app_wxlua" template="wxlua" cond="USE_WXLUAAPP=='1'"> - <srcdir>$(WXLUA_APPSDIR)</srcdir> <app-type>gui</app-type> <sources>$(WXLUAAPP_SRC)</sources> <headers>$(WXLUAAPP_HDR)</headers> ! <dirname>$(WXLUA_BASEDIR)/bin</dirname> <install-to>$(BINDIR)</install-to> --- 65,74 ---- as a module target... this would lead to problems when creating global DSW file... --> <exe id="app_wxlua" template="wxlua" cond="USE_WXLUAAPP=='1'"> <app-type>gui</app-type> + <srcdir>$(WXLUA_APPSDIR)</srcdir> <sources>$(WXLUAAPP_SRC)</sources> <headers>$(WXLUAAPP_HDR)</headers> ! <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <install-to>$(BINDIR)</install-to> *************** *** 95,105 **** <exe id="app_wxluaedit" template="wxlua" cond="USE_WXLUAEDITAPP=='1'"> - <srcdir>$(WXLUA_APPSDIR)</srcdir> <app-type>gui</app-type> <sources>$(WXLUAEDITAPP_SRC)</sources> <headers>$(WXLUAEDITAPP_HDR)</headers> <install-to>$(BINDIR)</install-to> ! <dirname>$(WXLUA_BASEDIR)/bin</dirname> <exename>wxluaedit</exename> --- 98,108 ---- <exe id="app_wxluaedit" template="wxlua" cond="USE_WXLUAEDITAPP=='1'"> <app-type>gui</app-type> + <srcdir>$(WXLUA_APPSDIR)</srcdir> <sources>$(WXLUAEDITAPP_SRC)</sources> <headers>$(WXLUAEDITAPP_HDR)</headers> <install-to>$(BINDIR)</install-to> ! <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <exename>wxluaedit</exename> |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:02
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/modules/wxlua/src Modified Files: internal.cpp Log Message: fixed top_builddir problems Index: internal.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** internal.cpp 23 Jan 2006 04:38:29 -0000 1.25 --- internal.cpp 27 Jan 2006 21:57:12 -0000 1.26 *************** *** 1165,1176 **** int LUACALL CreateStandaloneBitmaps(lua_State *L) { ! #include "../art/new.xpm" ! #include "../art/open.xpm" ! #include "../art/save.xpm" ! #include "../art/saveall.xpm" ! #include "../art/cut.xpm" ! #include "../art/copy.xpm" ! #include "../art/paste.xpm" ! #include "../art/help.xpm" wxCHECK_MSG(s_wxluatag_wxBitmap != -1, 1, wxT("wxBitmap is not wrapped by wxLua")); --- 1165,1176 ---- int LUACALL CreateStandaloneBitmaps(lua_State *L) { ! #include "art/new.xpm" ! #include "art/open.xpm" ! #include "art/save.xpm" ! #include "art/saveall.xpm" ! #include "art/cut.xpm" ! #include "art/copy.xpm" ! #include "art/paste.xpm" ! #include "art/help.xpm" wxCHECK_MSG(s_wxluatag_wxBitmap != -1, 1, wxT("wxBitmap is not wrapped by wxLua")); |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:02
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/apps/build/msw Modified Files: makefile.gcc Log Message: fixed top_builddir problems Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** makefile.gcc 25 Jan 2006 18:35:58 -0000 1.15 --- makefile.gcc 27 Jan 2006 21:57:06 -0000 1.16 *************** *** 192,196 **** mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_0) --include-dir ../../..\modules mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp --- 192,196 ---- mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_0) --include-dir ../../../modules mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp *************** *** 201,205 **** mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_0) --include-dir ../../..\modules .PHONY: all clean --- 201,205 ---- mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_0) --include-dir ../../../modules .PHONY: all clean |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:01
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/modules/build/bakefiles Modified Files: modules.bkl options.bkl Log Message: fixed top_builddir problems Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/options.bkl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** options.bkl 29 Nov 2005 23:52:11 -0000 1.6 --- options.bkl 27 Jan 2006 21:57:10 -0000 1.7 *************** *** 35,39 **** <!-- ================================================================== --> ! <!-- module enable/disable options --> <if cond="TARGETING_IDE=='0'"> <option name="USE_WXLUADEBUGLIB"> --- 35,40 ---- <!-- ================================================================== --> ! <!-- wxbind and wxlua cannot be disabled ! --> ! <if cond="TARGETING_IDE=='0'"> <option name="USE_WXLUADEBUGLIB"> *************** *** 55,59 **** skip some target and do not generate DSP files for that one. We don't want this: we want to generate DSP for all modules: the choice ! of the modules to compile will be left to the user... --> <set var="USE_WXLUADEBUGLIB">1</set> <set var="USE_WXLUASOCKETLIB">1</set> --- 56,60 ---- skip some target and do not generate DSP files for that one. We don't want this: we want to generate DSP for all modules: the choice ! of the modules to compile will be left to the user through the IDE GUI... --> <set var="USE_WXLUADEBUGLIB">1</set> <set var="USE_WXLUASOCKETLIB">1</set> Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** modules.bkl 25 Jan 2006 18:35:58 -0000 1.13 --- modules.bkl 27 Jan 2006 21:57:09 -0000 1.14 *************** *** 21,40 **** <!-- ================================================================== --> ! <!-- All the source files & header files linked above are relative to our base dir --> <if cond="FORMAT!='autoconf'"> <set var="WXLUA_MODULEDIR">../..</set> ! <set var="WXLUA_BASEDIR">$(WXLUA_MODULEDIR)/..</set> </if> <if cond="FORMAT=='autoconf'"> <!-- In this way we support makefiles created from folders != root folder; i.e. with this trick you can do: mkdir mybuild && cd mybuild && ../configure && make --> - <set var="WXLUA_MODULEDIR">$(top_srcdir)/modules</set> <set var="WXLUA_BASEDIR">$(top_srcdir)</set> ! </if> ! <!-- all the sources listed into sources.bkl contain path relative to our MODULES dir --> ! <set var="SRCDIR">$(WXLUA_MODULEDIR.replace('$(top_srcdir)', '..'))</set> <!-- the ldllmain.c file must be excluded ! --> --- 21,50 ---- <!-- ================================================================== --> ! <!-- All the source files & header files linked above are relative to our MODULE dir. --> <if cond="FORMAT!='autoconf'"> + <set var="WXLUA_BASEDIR">../../..</set> <set var="WXLUA_MODULEDIR">../..</set> ! <set var="SRCDIR">$(WXLUA_MODULEDIR)</set> ! ! <set var="WXLUA_SOURCEDIR">$(WXLUA_MODULEDIR)</set> ! <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'"> + <set var="SRCDIR">.</set> + <!-- In this way we support makefiles created from folders != root folder; i.e. with this trick you can do: mkdir mybuild && cd mybuild && ../configure && make --> <set var="WXLUA_BASEDIR">$(top_srcdir)</set> ! <set var="WXLUA_SOURCEDIR">$(top_srcdir)/modules</set> ! <!-- top_builddir already ends with '/' --> ! <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> <!-- the ldllmain.c file must be excluded ! --> *************** *** 75,80 **** <define-rule name="wxlua_lib" extends="lib"> <template> ! <srcdir>$(WXLUA_MODULEDIR)</srcdir> ! <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> <install-to>$(LIBDIR)</install-to> <headers-install-to>$(INCLUDEDIR)</headers-install-to> --- 85,90 ---- <define-rule name="wxlua_lib" extends="lib"> <template> ! <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> <install-to>$(LIBDIR)</install-to> <headers-install-to>$(INCLUDEDIR)</headers-install-to> *************** *** 86,95 **** <set var="__modnamelow">$(__modname.lower())</set> ! <libname>$(__modnamelow)</libname> <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if> <!-- to make MSVC6PRJ output look better... --> --- 96,111 ---- <set var="__modnamelow">$(__modname.lower())</set> ! <!-- ! The library name will look something like: ! libwxlua_[gtk2|x11|...][u][d]_[modulename]-[wxversion].so (or .a) ! on Unix; on win32 instead: ! libwxlua_msw[u][d]_[modulename]-[wxversion without dots].dll (or .lib) ! --> ! <wxlike-libname>$(__modnamelow)</wxlike-libname> <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> <!-- to make MSVC6PRJ output look better... --> *************** *** 101,106 **** <define-rule name="wxlua_dll" extends="dll"> <template> ! <srcdir>$(WXLUA_MODULEDIR)</srcdir> ! <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dirname> <install-to>$(LIBDIR)</install-to> <headers-install-to>$(INCLUDEDIR)</headers-install-to> --- 117,122 ---- <define-rule name="wxlua_dll" extends="dll"> <template> ! <srcdir>$(WXLUA_SOURCEDIR)</srcdir> ! <dirname>$(WXLUA_DLLOUTPUT_PATH)</dirname> <install-to>$(LIBDIR)</install-to> <headers-install-to>$(INCLUDEDIR)</headers-install-to> *************** *** 113,118 **** <!-- Libraries must be put in the right order ! --> <wxlua-req-libs/> <wx-lib>adv</wx-lib> ! <wx-lib>xml</wx-lib> <!-- in case we're using the XML layout load/save system --> <wx-lib>core</wx-lib> <wx-lib>base</wx-lib> --- 129,138 ---- <!-- Libraries must be put in the right order ! --> <wxlua-req-libs/> + <wx-lib>xrc</wx-lib> + <wx-lib>html</wx-lib> + <wx-lib>media</wx-lib> <wx-lib>adv</wx-lib> ! <wx-lib>net</wx-lib> ! <wx-lib>xml</wx-lib> <wx-lib>core</wx-lib> <wx-lib>base</wx-lib> *************** *** 124,133 **** <set var="__modnamelow">$(__modname.lower())</set> ! <libname>$(__modnamelow)</libname> <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)$(DIRSEP)contrib$(DIRSEP)include</include></if> <!-- to make MSVC6PRJ output look better... --> --- 144,153 ---- <set var="__modnamelow">$(__modname.lower())</set> ! <wxlike-libname>$(__modnamelow)</wxlike-libname> <sources>$(mk.evalExpr('$(' + value + '_SRC)'))</sources> <headers>$(mk.evalExpr('$(' + value + '_HDR)'))</headers> <!-- This is required because wxbind.h refers to wx contrib section, too --> ! <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> <!-- to make MSVC6PRJ output look better... --> *************** *** 142,164 **** - <!-- ================================================================== --> - <!-- AUXILIARY TARGETS --> - <!-- ================================================================== --> - - <if cond="TARGETING_IDE=='0' and TARGETING_WIN32=='1'"> - - <!-- the two folders where output will be stored --> - <mkdir id="setuplibdir"> - <dependency-of>all</dependency-of> - <dir>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dir> - </mkdir> - <mkdir id="setupdlldir"> - <dependency-of>all</dependency-of> - <dir>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_DLLOUTPUT_FOLDER)</dir> - </mkdir> - </if> - - - <!-- ================================================================== --> <!-- The list of wxLua MODULES --> --- 162,165 ---- *************** *** 174,184 **** the same conventions followed by other modules... --> <lib id="mod_lua_lib" template="wxbase"> ! <srcdir>$(WXLUA_MODULEDIR)</srcdir> <define>WXLUA_CODE</define> <sources>$(LUA_SRC) $(LUALIB_SRC)</sources> <headers>$(LUA_HDR) $(LUALIB_HDR)</headers> ! <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> ! <dirname>$(WXLUA_BASEDIR)$(DIRSEP)$(WXLUA_LIBOUTPUT_FOLDER)</dirname> ! <libname>lua</libname> <install-to>$(LIBDIR)</install-to> --- 175,185 ---- the same conventions followed by other modules... --> <lib id="mod_lua_lib" template="wxbase"> ! <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <define>WXLUA_CODE</define> <sources>$(LUA_SRC) $(LUALIB_SRC)</sources> <headers>$(LUA_HDR) $(LUALIB_HDR)</headers> ! <include>$(WXLUA_SOURCEDIR)/lua/include</include> ! <dirname>$(WXLUA_LIBOUTPUT_PATH)</dirname> ! <wxlike-libname>lua</wxlike-libname> <install-to>$(LIBDIR)</install-to> *************** *** 189,197 **** NOTE: like for lua_lib we don't use any wxLua-project-specific rule here --> <exe id="mod_lua" template="wxbase"> ! <srcdir>$(WXLUA_MODULEDIR)</srcdir> <library>mod_lua_lib</library> <sources>lua/src/lua/lua.c</sources> ! <include>$(WXLUA_MODULEDIR)$(DIRSEP)lua$(DIRSEP)include</include> ! <dirname>$(WXLUA_BASEDIR)$(DIRSEP)bin</dirname> <exename>lua</exename> <if cond="TARGETING_WIN32=='0'"> --- 190,198 ---- NOTE: like for lua_lib we don't use any wxLua-project-specific rule here --> <exe id="mod_lua" template="wxbase"> ! <srcdir>$(WXLUA_SOURCEDIR)</srcdir> <library>mod_lua_lib</library> <sources>lua/src/lua/lua.c</sources> ! <include>$(WXLUA_SOURCEDIR)/lua/include</include> ! <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <exename>lua</exename> <if cond="TARGETING_WIN32=='0'"> *************** *** 206,212 **** --- 207,217 ---- <!-- the wxLua lib & dll --> <wxlua_lib id="wxlua_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> + <!-- This include is necessary in order to access to art/ folder of wxLua --> + <include>./$(WXLUA_BASEDIR)</include> <module-name>WXLUA</module-name> </wxlua_lib> <wxlua_dll id="wxlua_dll" template="wxlua" cond="WX_SHARED=='1'"> + <!-- This include is necessary in order to access to art/ folder of wxLua --> + <include>./$(WXLUA_BASEDIR)</include> <module-name>WXLUA</module-name> </wxlua_dll> |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:58:00
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: fixed top_builddir problems Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.vc 25 Jan 2006 18:35:58 -0000 1.11 --- makefile.vc 27 Jan 2006 21:57:09 -0000 1.12 *************** *** 70,87 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" ! WXLIBPOSTFIX = d !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif ! !if "$(USE_UTIL)" == "1" ! __utils___depname = sub_utils !endif ! !if "$(USE_APPS)" == "1" ! __apps___depname = sub_apps !endif --- 70,87 ---- ### Conditionally set variables: ### ! !if "$(USE_UTIL)" == "1" ! __utils___depname = sub_utils !endif ! !if "$(USE_APPS)" == "1" ! __apps___depname = sub_apps !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" ! WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif *************** *** 93,97 **** ### Targets: ### ! all: $(__utils___depname) sub_modules $(__apps___depname) clean: --- 93,97 ---- ### Targets: ### ! all: ..\..\..\lib\vc_lib$(WXLIBPOSTFIX) ..\..\..\lib\vc_dll$(WXLIBPOSTFIX) ..\..\..\bin $(__utils___depname) sub_modules $(__apps___depname) clean: *************** *** 99,115 **** -if exist msvc$(WXLIBPOSTFIX)\*.res del msvc$(WXLIBPOSTFIX)\*.res -if exist msvc$(WXLIBPOSTFIX)\*.pch del msvc$(WXLIBPOSTFIX)\*.pch ! cd ..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) ! cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) ! cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) !if "$(USE_UTIL)" == "1" sub_utils: ! cd ..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) --- 99,124 ---- -if exist msvc$(WXLIBPOSTFIX)\*.res del msvc$(WXLIBPOSTFIX)\*.res -if exist msvc$(WXLIBPOSTFIX)\*.pch del msvc$(WXLIBPOSTFIX)\*.pch ! cd ..\..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) ! cd ..\..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) ! cd ..\..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) + ..\..\..\lib\vc_lib$(WXLIBPOSTFIX): + if not exist ..\..\..\lib\vc_lib$(WXLIBPOSTFIX) mkdir ..\..\..\lib\vc_lib$(WXLIBPOSTFIX) + + ..\..\..\lib\vc_dll$(WXLIBPOSTFIX): + if not exist ..\..\..\lib\vc_dll$(WXLIBPOSTFIX) mkdir ..\..\..\lib\vc_dll$(WXLIBPOSTFIX) + + ..\..\..\bin: + if not exist ..\..\..\bin mkdir ..\..\..\bin + !if "$(USE_UTIL)" == "1" sub_utils: ! cd ..\..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) *************** *** 117,121 **** sub_modules: ! cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) --- 126,130 ---- sub_modules: ! cd ..\..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) *************** *** 123,129 **** !if "$(USE_APPS)" == "1" sub_apps: ! cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) !endif --- 132,145 ---- !if "$(USE_APPS)" == "1" sub_apps: ! cd ..\..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) !endif + docs: + @echo ============================================= + @echo Creating wxLua documentation using doxygen... + @echo ============================================= + cd ../../..\docs + doxygen doxygen.cfg + Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** makefile.bcc 25 Jan 2006 18:35:58 -0000 1.10 --- makefile.bcc 27 Jan 2006 21:57:09 -0000 1.11 *************** *** 142,159 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" ! WXLIBPOSTFIX = d !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif ! !if "$(USE_UTIL)" == "1" ! __utils___depname = utils !endif ! !if "$(USE_APPS)" == "1" ! __apps___depname = apps !endif --- 142,159 ---- ### Conditionally set variables: ### ! !if "$(USE_UTIL)" == "1" ! __utils___depname = utils !endif ! !if "$(USE_APPS)" == "1" ! __apps___depname = apps !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" ! WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif *************** *** 165,169 **** ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) clean: --- 165,169 ---- ### Targets: ### ! all: ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX) ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX) ..\..\..\bin $(__utils___depname) modules $(__apps___depname) clean: *************** *** 171,190 **** -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm ! @echo cd ..\..\util\build\msw >borland$(WXLIBPOSTFIX)\utils.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\utils.bat call borland$(WXLIBPOSTFIX)\utils.bat @del borland$(WXLIBPOSTFIX)\utils.bat ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\modules.bat call borland$(WXLIBPOSTFIX)\modules.bat @del borland$(WXLIBPOSTFIX)\modules.bat ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\apps.bat call borland$(WXLIBPOSTFIX)\apps.bat @del borland$(WXLIBPOSTFIX)\apps.bat !if "$(USE_UTIL)" == "1" utils: ! @echo cd ..\..\util\build\msw >borland$(WXLIBPOSTFIX)\utils.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\utils.bat call borland$(WXLIBPOSTFIX)\utils.bat --- 171,199 ---- -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm ! @echo cd ..\..\..\util\build\msw >borland$(WXLIBPOSTFIX)\utils.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\utils.bat call borland$(WXLIBPOSTFIX)\utils.bat @del borland$(WXLIBPOSTFIX)\utils.bat ! @echo cd ..\..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\modules.bat call borland$(WXLIBPOSTFIX)\modules.bat @del borland$(WXLIBPOSTFIX)\modules.bat ! @echo cd ..\..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\apps.bat call borland$(WXLIBPOSTFIX)\apps.bat @del borland$(WXLIBPOSTFIX)\apps.bat + ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX): + if not exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX) mkdir ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX) + + ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX): + if not exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX) mkdir ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX) + + ..\..\..\bin: + if not exist ..\..\..\bin mkdir ..\..\..\bin + !if "$(USE_UTIL)" == "1" utils: ! @echo cd ..\..\..\util\build\msw >borland$(WXLIBPOSTFIX)\utils.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\utils.bat call borland$(WXLIBPOSTFIX)\utils.bat *************** *** 193,197 **** modules: ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\modules.bat call borland$(WXLIBPOSTFIX)\modules.bat --- 202,206 ---- modules: ! @echo cd ..\..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\modules.bat call borland$(WXLIBPOSTFIX)\modules.bat *************** *** 200,204 **** !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\apps.bat call borland$(WXLIBPOSTFIX)\apps.bat --- 209,213 ---- !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\apps.bat call borland$(WXLIBPOSTFIX)\apps.bat *************** *** 206,207 **** --- 215,223 ---- !endif + docs: + @echo ============================================= + @echo Creating wxLua documentation using doxygen... + @echo ============================================= + cd ../../..\docs + doxygen doxygen.cfg + Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** makefile.wat 25 Jan 2006 18:35:58 -0000 1.10 --- makefile.wat 27 Jan 2006 21:57:09 -0000 1.11 *************** *** 74,81 **** ### Conditionally set variables: ### WXLIBPOSTFIX = ! !ifeq WX_DEBUG 1 !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = ud !endif !endif --- 74,89 ---- ### Conditionally set variables: ### + __utils___depname = + !ifeq USE_UTIL 1 + __utils___depname = utils + !endif + __apps___depname = + !ifeq USE_APPS 1 + __apps___depname = apps + !endif WXLIBPOSTFIX = ! !ifeq WX_DEBUG 0 !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = u !endif !endif *************** *** 85,101 **** !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = u !endif !endif - __utils___depname = - !ifeq USE_UTIL 1 - __utils___depname = utils - !endif - __apps___depname = - !ifeq USE_APPS 1 - __apps___depname = apps - !endif ### Variables: ### --- 93,101 ---- !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = ud !endif !endif ### Variables: ### *************** *** 117,121 **** ### Targets: ### ! all : .SYMBOLIC $(__utils___depname) modules $(__apps___depname) clean : .SYMBOLIC --- 117,121 ---- ### Targets: ### ! all : .SYMBOLIC ..\..\..\lib\wat_lib$(WXLIBPOSTFIX) ..\..\..\lib\wat_dll$(WXLIBPOSTFIX) ..\..\..\bin $(__utils___depname) modules $(__apps___depname) clean : .SYMBOLIC *************** *** 125,141 **** -if exist watcom$(WXLIBPOSTFIX)\*.ilk del watcom$(WXLIBPOSTFIX)\*.ilk -if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch ! cd ..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) ! cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) ! cd ..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) !ifeq USE_UTIL 1 utils : .SYMBOLIC ! cd ..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) --- 125,150 ---- -if exist watcom$(WXLIBPOSTFIX)\*.ilk del watcom$(WXLIBPOSTFIX)\*.ilk -if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch ! cd ..\..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) ! cd ..\..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) ! cd ..\..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) + ..\..\..\lib\wat_lib$(WXLIBPOSTFIX) : + if not exist ..\..\..\lib\wat_lib$(WXLIBPOSTFIX) mkdir ..\..\..\lib\wat_lib$(WXLIBPOSTFIX) + + ..\..\..\lib\wat_dll$(WXLIBPOSTFIX) : + if not exist ..\..\..\lib\wat_dll$(WXLIBPOSTFIX) mkdir ..\..\..\lib\wat_dll$(WXLIBPOSTFIX) + + ..\..\..\bin : + if not exist ..\..\..\bin mkdir ..\..\..\bin + !ifeq USE_UTIL 1 utils : .SYMBOLIC ! cd ..\..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) *************** *** 143,147 **** modules : .SYMBOLIC ! cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) --- 152,156 ---- modules : .SYMBOLIC ! cd ..\..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) *************** *** 149,155 **** !ifeq USE_APPS 1 apps : .SYMBOLIC ! cd ..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) !endif --- 158,171 ---- !ifeq USE_APPS 1 apps : .SYMBOLIC ! cd ..\..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) !endif + docs : + @echo ============================================= + @echo Creating wxLua documentation using doxygen... + @echo ============================================= + cd ../../..\docs + doxygen doxygen.cfg + Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** makefile.gcc 25 Jan 2006 18:35:58 -0000 1.10 --- makefile.gcc 27 Jan 2006 21:57:09 -0000 1.11 *************** *** 66,72 **** ### Conditionally set variables: ### ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = ud endif endif --- 66,78 ---- ### Conditionally set variables: ### ! ifeq ($(USE_UTIL),1) ! __utils___depname = utils ! endif ! ifeq ($(USE_APPS),1) ! __apps___depname = apps ! endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u endif endif *************** *** 76,89 **** endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u ! endif ! endif ! ifeq ($(USE_UTIL),1) ! __utils___depname = utils endif - ifeq ($(USE_APPS),1) - __apps___depname = apps endif --- 82,89 ---- endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = ud endif endif *************** *** 95,120 **** ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) clean: -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o -if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d ! $(MAKE) -C ..\..\util\build\msw -f makefile.gcc $(MAKEARGS) clean ! $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean ! $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean ifeq ($(USE_UTIL),1) utils: ! $(MAKE) -C ..\..\util\build\msw -f makefile.gcc $(MAKEARGS) endif modules: ! $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) ifeq ($(USE_APPS),1) apps: ! $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) endif .PHONY: all clean utils modules apps --- 95,136 ---- ### Targets: ### ! all: ..\..\..\lib\gcc_lib$(WXLIBPOSTFIX) ..\..\..\lib\gcc_dll$(WXLIBPOSTFIX) ..\..\..\bin $(__utils___depname) modules $(__apps___depname) clean: -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o -if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d ! $(MAKE) -C ..\..\..\util\build\msw -f makefile.gcc $(MAKEARGS) clean ! $(MAKE) -C ..\..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean ! $(MAKE) -C ..\..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean ! ! ..\..\..\lib\gcc_lib$(WXLIBPOSTFIX): ! if not exist ..\..\..\lib\gcc_lib$(WXLIBPOSTFIX) mkdir ..\..\..\lib\gcc_lib$(WXLIBPOSTFIX) ! ! ..\..\..\lib\gcc_dll$(WXLIBPOSTFIX): ! if not exist ..\..\..\lib\gcc_dll$(WXLIBPOSTFIX) mkdir ..\..\..\lib\gcc_dll$(WXLIBPOSTFIX) ! ! ..\..\..\bin: ! if not exist ..\..\..\bin mkdir ..\..\..\bin ifeq ($(USE_UTIL),1) utils: ! $(MAKE) -C ..\..\..\util\build\msw -f makefile.gcc $(MAKEARGS) endif modules: ! $(MAKE) -C ..\..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) ifeq ($(USE_APPS),1) apps: ! $(MAKE) -C ..\..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) endif + docs: + @echo ============================================= + @echo Creating wxLua documentation using doxygen... + @echo ============================================= + cd ../../..\docs + doxygen doxygen.cfg + .PHONY: all clean utils modules apps |
|
From: Francesco M. <fr...@us...> - 2006-01-27 21:57:26
|
Update of /cvsroot/wxlua/wxLua/util/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/util/build/msw Modified Files: util.dsp Log Message: fixed top_builddir problems Index: util.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/util.dsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** util.dsp 25 Jan 2006 18:35:59 -0000 1.6 --- util.dsp 27 Jan 2006 21:57:14 -0000 1.7 *************** *** 236,240 **** # Begin Source File ! SOURCE=..\..\bin2c\bin2c.c # End Source File # End Group --- 236,240 ---- # Begin Source File ! SOURCE=../..\bin2c\bin2c.c # End Source File # End Group |
|
From: klaas.holwerda <kho...@xs...> - 2006-01-27 21:37:09
|
Hi John, Should/can i add the new app/sample to CVS, That way Francesco can make it work in bakefile too.? Or do you want to wait for some reason. There is still the problem of not correctly working bindings, but that can be solved later. The sample it self works oke, only the scripts will not until that is solved. I tired to figure out how to solve it, but i get lost in all the references, and do not no how to register the funtions uniquely. Somehow the taking starts with 0 all the time, i don't how it works. regards, Klaas |
|
From: John L. <jr...@us...> - 2006-01-26 23:41:09
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4069/wxLua/bindings/wxwidgets Modified Files: datetime.i Log Message: use time_t not long Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** datetime.i 24 Nov 2005 03:38:05 -0000 1.4 --- datetime.i 26 Jan 2006 23:41:02 -0000 1.5 *************** *** 139,143 **** %constructor wxDateTimeFromDMY(int day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, int hour = 0, int minute = 0, int second = 0, int millisec = 0) wxDateTime& SetToCurrent() ! %rename SetToTime wxDateTime& Set(long time) %rename SetToJDN wxDateTime& Set(double dateTime) %rename SetToHMS wxDateTime& Set(int hour, int minute, int second, int millisec) --- 139,143 ---- %constructor wxDateTimeFromDMY(int day, wxDateTime::Month month = wxDateTime::Inv_Month, int year = wxDateTime::Inv_Year, int hour = 0, int minute = 0, int second = 0, int millisec = 0) wxDateTime& SetToCurrent() ! %rename SetToTime wxDateTime& Set(time_t time) %rename SetToJDN wxDateTime& Set(double dateTime) %rename SetToHMS wxDateTime& Set(int hour, int minute, int second, int millisec) |
|
From: Francesco M. <fr...@us...> - 2006-01-25 19:17:18
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27247 Modified Files: wxLua.dsw Log Message: changed to win32 EOL Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/wxLua.dsw,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxLua.dsw 25 Jan 2006 18:35:58 -0000 1.3 --- wxLua.dsw 25 Jan 2006 19:17:09 -0000 1.4 *************** *** 1,164 **** ! Microsoft Developer Studio Workspace File, Format Version 6.00 ! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ! ! ############################################################################### ! ! Project: "app_wxlua"=..\..\apps\build\msw\apps_app_wxlua.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name mod_lua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_lua_lib ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxbind ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxlua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxluadebug ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxluasocket ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "app_wxluaedit"=..\..\apps\build\msw\apps_app_wxluaedit.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name mod_lua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_lua_lib ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxbind ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxlua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxluadebug ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxluasocket ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "mod_lua"=..\..\modules\build\msw\modules_mod_lua.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name mod_lua_lib ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "mod_lua_lib"=..\..\modules\build\msw\modules_mod_lua_lib.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "mod_wxbind"=..\..\modules\build\msw\modules_mod_wxbind.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "mod_wxlua"=..\..\modules\build\msw\modules_mod_wxlua.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "mod_wxluadebug"=..\..\modules\build\msw\modules_mod_wxluadebug.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "mod_wxluasocket"=..\..\modules\build\msw\modules_mod_wxluasocket.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "util_bin2c"=..\..\util\build\msw\util.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Global: ! ! Package=<5> ! {{{ ! }}} ! ! Package=<3> ! {{{ ! }}} ! ! ############################################################################### ! --- 1,164 ---- ! Microsoft Developer Studio Workspace File, Format Version 6.00 ! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ! ! ############################################################################### ! ! Project: "app_wxlua"=..\..\apps\build\msw\apps_app_wxlua.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name mod_lua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_lua_lib ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxbind ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxlua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxluadebug ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxluasocket ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "app_wxluaedit"=..\..\apps\build\msw\apps_app_wxluaedit.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name mod_lua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_lua_lib ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxbind ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxlua ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxluadebug ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name mod_wxluasocket ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "mod_lua"=..\..\modules\build\msw\modules_mod_lua.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name mod_lua_lib ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "mod_lua_lib"=..\..\modules\build\msw\modules_mod_lua_lib.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "mod_wxbind"=..\..\modules\build\msw\modules_mod_wxbind.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "mod_wxlua"=..\..\modules\build\msw\modules_mod_wxlua.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "mod_wxluadebug"=..\..\modules\build\msw\modules_mod_wxluadebug.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "mod_wxluasocket"=..\..\modules\build\msw\modules_mod_wxluasocket.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Project: "util_bin2c"=..\..\util\build\msw\util.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! ! Global: ! ! Package=<5> ! {{{ ! }}} ! ! Package=<3> ! {{{ ! }}} ! ! ############################################################################### ! |
|
From: Francesco M. <fr...@us...> - 2006-01-25 19:13:29
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25263/modules Modified Files: Makefile.in Log Message: fixed top_srcdir problem with make install Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Makefile.in 25 Jan 2006 18:35:58 -0000 1.16 --- Makefile.in 25 Jan 2006 19:13:19 -0000 1.17 *************** *** 455,459 **** $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ fi; \ ! $(INSTALL_DATA) ../modules/$$f $(DESTDIR)$(includedir)/$$f; \ done --- 455,459 ---- $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ fi; \ ! $(INSTALL_DATA) $(top_srcdir)/modules/$$f $(DESTDIR)$(includedir)/$$f; \ done *************** *** 493,497 **** @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_0@ fi; \ ! @COND_WX_SHARED_0@ $(INSTALL_DATA) ../modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_0@ done --- 493,497 ---- @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_0@ fi; \ ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_srcdir)/modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_0@ done *************** *** 522,526 **** @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_1@ fi; \ ! @COND_WX_SHARED_1@ $(INSTALL_DATA) ../modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_1@ done --- 522,526 ---- @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_1@ fi; \ ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_srcdir)/modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_1@ done *************** *** 548,552 **** @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_0@ fi; \ ! @COND_WX_SHARED_0@ $(INSTALL_DATA) ../modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_0@ done --- 548,552 ---- @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_0@ fi; \ ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_srcdir)/modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_0@ done *************** *** 577,581 **** @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_1@ fi; \ ! @COND_WX_SHARED_1@ $(INSTALL_DATA) ../modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_1@ done --- 577,581 ---- @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_1@ fi; \ ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_srcdir)/modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_1@ done *************** *** 603,607 **** @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_0@ fi; \ ! @COND_WX_SHARED_0@ $(INSTALL_DATA) ../modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_0@ done --- 603,607 ---- @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_0@ fi; \ ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_srcdir)/modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_0@ done *************** *** 632,636 **** @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_1@ fi; \ ! @COND_WX_SHARED_1@ $(INSTALL_DATA) ../modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_1@ done --- 632,636 ---- @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_1@ fi; \ ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_srcdir)/modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_1@ done *************** *** 658,662 **** @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_0@ fi; \ ! @COND_WX_SHARED_0@ $(INSTALL_DATA) ../modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_0@ done --- 658,662 ---- @COND_WX_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_0@ fi; \ ! @COND_WX_SHARED_0@ $(INSTALL_DATA) $(top_srcdir)/modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_0@ done *************** *** 687,691 **** @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_1@ fi; \ ! @COND_WX_SHARED_1@ $(INSTALL_DATA) ../modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_1@ done --- 687,691 ---- @COND_WX_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_WX_SHARED_1@ fi; \ ! @COND_WX_SHARED_1@ $(INSTALL_DATA) $(top_srcdir)/modules/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_WX_SHARED_1@ done |
|
From: Francesco M. <fr...@us...> - 2006-01-25 18:38:54
|
Update of /cvsroot/wxlua/wxLua/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11967/bin Added Files: .cvsignore Log Message: .cvsignore details --- NEW FILE: .cvsignore --- *lua* bin2c |
|
From: Francesco M. <fr...@us...> - 2006-01-25 18:38:54
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11967/build/autoconf Modified Files: .cvsignore Log Message: .cvsignore details Index: .cvsignore =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** .cvsignore 20 Nov 2005 11:41:38 -0000 1.1 --- .cvsignore 25 Jan 2006 18:38:44 -0000 1.2 *************** *** 1 **** --- 1,2 ---- autom4te.cache + wxlua.pc |
|
From: Francesco M. <fr...@us...> - 2006-01-25 18:38:54
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11967/apps Modified Files: .cvsignore Log Message: .cvsignore details Index: .cvsignore =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** .cvsignore 23 Jan 2006 21:22:39 -0000 1.2 --- .cvsignore 25 Jan 2006 18:38:44 -0000 1.3 *************** *** 3,8 **** bk-deps *.o ! wxlua* ! wxluaedit* ! bin2c* ! lua* \ No newline at end of file --- 3,6 ---- bk-deps *.o ! *.d ! .deps |
