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-02-03 18:41:08
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10289 Modified Files: configure Log Message: added wxluacan sample to build system Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** configure 2 Feb 2006 23:02:28 -0000 1.9 --- configure 3 Feb 2006 18:40:50 -0000 1.10 *************** *** 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_FULL WX_VERSION_MAJOR WX_VERSION_MINOR WX_PORT WX_GTKPORT_VERSION WXLUA_MODNAMES WXLUA_LIBNAMES WXLUA_LDFLAGS 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_FULL WX_VERSION_MAJOR WX_VERSION_MINOR WX_PORT WX_GTKPORT_VERSION WXLUA_MODNAMES WXLUA_LIBNAMES WXLUA_LDFLAGS 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_WXLUACANAPP_1 COND_USE_WXLUAEDITAPP_1 COND_WINDOWS_IMPLIB_1 COND_WX_SHARED_0 COND_WX_SHARED_1 LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 821,824 **** --- 821,825 ---- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-wxlua-app Compiles the wxLua app (default is yes) + --enable-wxluacan-app Compiles the wxLuaCan app (default is yes) --enable-wxluaedit-app Compiles the wxLuaEditor app (default is no) --enable-wxluadebuglib Compiles the wxLua debug support (default is yes) *************** *** 1420,1423 **** --- 1421,1431 ---- enable_wxlua_app=yes fi; + # Check whether --enable-wxluacan-app or --disable-wxluacan-app was given. + if test "${enable_wxluacan_app+set}" = set; then + enableval="$enable_wxluacan_app" + + else + enable_wxluacan_app=yes + fi; # Check whether --enable-wxluaedit-app or --disable-wxluaedit-app was given. if test "${enable_wxluaedit_app+set}" = set; then *************** *** 1472,1475 **** --- 1480,1496 ---- + echo "$as_me:$LINENO: checking for --enable-wxluacan-app option" >&5 + echo $ECHO_N "checking for --enable-wxluacan-app option... $ECHO_C" >&6 + if [ "x$enable_wxluacan_app" = "xyes" ]; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + USE_WXLUACANAPP=1 + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 + USE_WXLUACANAPP=0 + fi + + echo "$as_me:$LINENO: checking for --enable-wxluaedit-app option" >&5 echo $ECHO_N "checking for --enable-wxluaedit-app option... $ECHO_C" >&6 *************** *** 6620,6623 **** --- 6641,6649 ---- fi + COND_USE_WXLUACANAPP_1="#" + if test "x$USE_WXLUACANAPP" = "x1" ; then + COND_USE_WXLUACANAPP_1="" + fi + COND_USE_WXLUAEDITAPP_1="#" if test "x$USE_WXLUAEDITAPP" = "x1" ; then *************** *** 7406,7409 **** --- 7432,7436 ---- s,@COND_USE_UTIL_1@,$COND_USE_UTIL_1,;t t s,@COND_USE_WXLUAAPP_1@,$COND_USE_WXLUAAPP_1,;t t + s,@COND_USE_WXLUACANAPP_1@,$COND_USE_WXLUACANAPP_1,;t t s,@COND_USE_WXLUAEDITAPP_1@,$COND_USE_WXLUAEDITAPP_1,;t t s,@COND_WINDOWS_IMPLIB_1@,$COND_WINDOWS_IMPLIB_1,;t t *************** *** 7708,7711 **** --- 7735,7743 ---- echo " - wxLua application DISABLED" fi + if [ "$USE_WXLUACANAPP" = "1" ]; then + echo " - wxLuaCan application ENABLED" + else + echo " - wxLuaCan application DISABLED" + fi if [ "$USE_WXLUAEDITAPP" = "1" ]; then echo " - wxLuaEdit application ENABLED" |
From: Francesco M. <fr...@us...> - 2006-02-03 18:41:05
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10289/apps/build/msw Modified Files: apps.dsw makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: added wxluacan sample to build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** makefile.vc 3 Feb 2006 16:55:47 -0000 1.19 --- makefile.vc 3 Feb 2006 18:40:50 -0000 1.20 *************** *** 45,48 **** --- 45,51 ---- USE_WXLUAAPP = 1 + # Compile the wxLuaCan app ? [0,1] + USE_WXLUACANAPP = 1 + # Compile the wxLuaEditor app ? [0,1] USE_WXLUAEDITAPP = 0 *************** *** 59,64 **** $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ ! $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ --- 62,67 ---- $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_4) \ ! $(____WX_DEBUG_5) $(______WX_DEBUG) /Fd..\..\..\bin\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ *************** *** 69,74 **** $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ ! $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT)\include \ /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) --- 72,77 ---- $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_4) \ ! $(____WX_DEBUG_5) $(______WX_DEBUG) /Fd..\..\..\bin\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT)\include \ /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) *************** *** 77,80 **** --- 80,101 ---- msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj \ msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res + APP_WXLUACAN_CXXFLAGS = /MD$(____WX_DEBUG_3) /DWIN32 $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ + /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_4) \ + $(____WX_DEBUG_5) $(______WX_DEBUG) /Fd..\..\..\bin\wxluacan.pdb \ + /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I..\..\..\modules\wxbind\setup \ + /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) + APP_WXLUACAN_OBJECTS = \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj \ + msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res ### Conditionally set variables: ### *************** *** 101,109 **** __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\vc_dll$(WXLIBPOSTFIX) !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE !endif !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_0 = /d _UNICODE !endif !if "$(WX_DEBUG)" == "1" --- 122,139 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\vc_dll$(WXLIBPOSTFIX) !endif + !if "$(USE_WXLUACANAPP)" == "1" + __app_wxluacan___depname = ..\..\..\bin\wxluacan.exe + !endif + !if "$(WX_SHARED)" == "0" + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\vc_lib$(WXLIBPOSTFIX) + !endif + !if "$(WX_SHARED)" == "1" + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\vc_dll$(WXLIBPOSTFIX) + !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE !endif !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_6 = /d _UNICODE !endif !if "$(WX_DEBUG)" == "1" *************** *** 111,115 **** !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_0 = /d __WXDEBUG__ !endif !if "$(WX_SHARED)" == "0" --- 141,145 ---- !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_6 = /d __WXDEBUG__ !endif !if "$(WX_SHARED)" == "0" *************** *** 120,127 **** !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED_0 = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED_0 = /d WXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" --- 150,157 ---- !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED_1 = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED_1 = /d WXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" *************** *** 132,151 **** !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_0 = /O2 !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_0 = /Od !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_1 = !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_1 = /Zi !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_2 = !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_2 = /DEBUG !endif !if "$(WX_DEBUG)" == "0" --- 162,181 ---- !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_4 = /O2 !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_4 = /Od !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_5 = !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_5 = /Zi !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_6 = !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_6 = /DEBUG !endif !if "$(WX_DEBUG)" == "0" *************** *** 156,163 **** !endif !if "$(WX_DEBUG)" == "0" ! ______WX_DEBUG_0 = !endif !if "$(WX_DEBUG)" == "1" ! ______WX_DEBUG_0 = /d _DEBUG !endif !if "$(WX_DEBUG)" == "0" --- 186,193 ---- !endif !if "$(WX_DEBUG)" == "0" ! ______WX_DEBUG_1 = !endif !if "$(WX_DEBUG)" == "1" ! ______WX_DEBUG_1 = /d _DEBUG !endif !if "$(WX_DEBUG)" == "0" *************** *** 190,194 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean: --- 220,224 ---- ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) clean: *************** *** 202,209 **** -if exist ..\..\..\bin\wxluaedit.ilk del ..\..\..\bin\wxluaedit.ilk -if exist ..\..\..\bin\wxluaedit.pdb del ..\..\..\bin\wxluaedit.pdb !if "$(USE_WXLUAAPP)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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 << --- 232,242 ---- -if exist ..\..\..\bin\wxluaedit.ilk del ..\..\..\bin\wxluaedit.ilk -if exist ..\..\..\bin\wxluaedit.pdb del ..\..\..\bin\wxluaedit.pdb + -if exist ..\..\..\bin\wxluacan.exe del ..\..\..\bin\wxluacan.exe + -if exist ..\..\..\bin\wxluacan.ilk del ..\..\..\bin\wxluacan.ilk + -if exist ..\..\..\bin\wxluacan.pdb del ..\..\..\bin\wxluacan.pdb !if "$(USE_WXLUAAPP)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_6) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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 << *************** *** 212,220 **** !if "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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 << !endif msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** --- 245,260 ---- !if "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_6) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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 << !endif + !if "$(USE_WXLUACANAPP)" == "1" + ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res + link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_6) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) /SUBSYSTEM:WINDOWS @<< + $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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 + << + !endif + msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 224,228 **** msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____WX_SHARED_0) $(______WX_DEBUG_0) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 264,268 ---- msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____WX_SHARED_1) $(______WX_DEBUG_1) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 233,236 **** msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____WX_SHARED_0) $(______WX_DEBUG_0) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** --- 273,306 ---- msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____WX_SHARED_1) $(______WX_DEBUG_1) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj: ..\..\wxluacan\src\wxluacan_class.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj: ..\..\wxluacan\src\wxluacan_object.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj: ..\..\wxluacan\src\wxluacan_define.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj: ..\..\wxluacan\src\wxluacan_builtin.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj: ..\..\wxluacan\src\wxluacan_event.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! msvc$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res: ..\..\wxluacan\src\wxluacan.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____WX_SHARED_1) $(______WX_DEBUG_1) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** makefile.bcc 3 Feb 2006 16:55:47 -0000 1.20 --- makefile.bcc 3 Feb 2006 18:40:50 -0000 1.21 *************** *** 70,73 **** --- 70,78 ---- !endif + # Compile the wxLuaCan app ? [0,1] + !ifndef USE_WXLUACANAPP + USE_WXLUACANAPP = 1 + !endif + # Compile the wxLuaEditor app ? [0,1] !ifndef USE_WXLUAEDITAPP *************** *** 86,90 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ --- 91,95 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_2) \ -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ *************** *** 94,98 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) --- 99,103 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_2) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) *************** *** 100,103 **** --- 105,124 ---- borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj + APP_WXLUACAN_CXXFLAGS = -I$(BCCDIR)\include $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ + -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_2) \ + -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ + $(CXXFLAGS) + APP_WXLUACAN_OBJECTS = \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj \ + borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj ### Conditionally set variables: ### *************** *** 124,132 **** __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\bcc_dll$(WXLIBPOSTFIX) !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_0 = -d_UNICODE !endif !if "$(WX_DEBUG)" == "1" --- 145,162 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\bcc_dll$(WXLIBPOSTFIX) !endif + !if "$(USE_WXLUACANAPP)" == "1" + __app_wxluacan___depname = ..\..\..\bin\wxluacan.exe + !endif + !if "$(WX_SHARED)" == "0" + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\bcc_lib$(WXLIBPOSTFIX) + !endif + !if "$(WX_SHARED)" == "1" + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\bcc_dll$(WXLIBPOSTFIX) + !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif !if "$(WX_UNICODE)" == "1" ! __WXUNICODE_DEFINE_p_6 = -d_UNICODE !endif !if "$(WX_DEBUG)" == "1" *************** *** 134,138 **** !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_0 = -d__WXDEBUG__ !endif !if "$(WX_SHARED)" == "0" --- 164,168 ---- !endif !if "$(WX_DEBUG)" == "1" ! __WXDEBUG_DEFINE_p_6 = -d__WXDEBUG__ !endif !if "$(WX_SHARED)" == "0" *************** *** 143,150 **** !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED_0 = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED_0 = -dWXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" --- 173,180 ---- !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED_1 = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED_1 = -dWXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" *************** *** 161,168 **** !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_1 = -v- !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_1 = -v !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" --- 191,198 ---- !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_2 = -v- !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_2 = -v !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" *************** *** 183,187 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean: --- 213,217 ---- ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) clean: *************** *** 201,208 **** -if exist ..\..\..\bin\wxluaedit.ilf del ..\..\..\bin\wxluaedit.ilf -if exist ..\..\..\bin\wxluaedit.ils del ..\..\..\bin\wxluaedit.ils !if "$(USE_WXLUAAPP)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | --- 231,244 ---- -if exist ..\..\..\bin\wxluaedit.ilf del ..\..\..\bin\wxluaedit.ilf -if exist ..\..\..\bin\wxluaedit.ils del ..\..\..\bin\wxluaedit.ils + -if exist ..\..\..\bin\wxluacan.exe del ..\..\..\bin\wxluacan.exe + -if exist ..\..\..\bin\wxluacan.tds del ..\..\..\bin\wxluacan.tds + -if exist ..\..\..\bin\wxluacan.ilc del ..\..\..\bin\wxluacan.ilc + -if exist ..\..\..\bin\wxluacan.ild del ..\..\..\bin\wxluacan.ild + -if exist ..\..\..\bin\wxluacan.ilf del ..\..\..\bin\wxluacan.ilf + -if exist ..\..\..\bin\wxluacan.ils del ..\..\..\bin\wxluacan.ils !if "$(USE_WXLUAAPP)" == "1" ..\..\..\bin\wxlua.exe: $(APP_WXLUA_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -aa @&&| c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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,, borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res | *************** *** 211,219 **** !if "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) -aa @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** --- 247,262 ---- !if "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\bin\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_1) -aa @&&| c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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,, borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res | !endif + !if "$(USE_WXLUACANAPP)" == "1" + ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) -aa @&&| + c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).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,, borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res + | + !endif + borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 223,227 **** borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_0) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 266,270 ---- borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_1) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 232,235 **** borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_0) $(__WXDEBUG_DEFINE_p_0) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_0) -i..\..\..\modules -i.\..\..\.. $** --- 275,308 ---- borland$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_1) -i..\..\..\modules -i.\..\..\.. $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj: ..\..\wxluacan\src\wxluacan_class.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj: ..\..\wxluacan\src\wxluacan_object.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj: ..\..\wxluacan\src\cansim.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj: ..\..\wxluacan\src\wxluacan_define.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj: ..\..\wxluacan\src\wxluacan_builtin.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj: ..\..\wxluacan\src\wxluacan_event.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! borland$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res: ..\..\wxluacan\src\wxluacan.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____WX_SHARED_1) -i..\..\..\modules -i.\..\..\.. $** Index: apps.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps.dsw,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** apps.dsw 25 Jan 2006 18:35:58 -0000 1.4 --- apps.dsw 3 Feb 2006 18:40:50 -0000 1.5 *************** *** 27,28 **** --- 27,40 ---- ############################################################################### + Project: "app_wxluacan"=apps_app_wxluacan.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** makefile.wat 3 Feb 2006 16:55:47 -0000 1.20 --- makefile.wat 3 Feb 2006 18:40:50 -0000 1.21 *************** *** 45,48 **** --- 45,51 ---- USE_WXLUAAPP = 1 + # Compile the wxLuaCan app ? [0,1] + USE_WXLUACANAPP = 1 + # Compile the wxLuaEditor app ? [0,1] USE_WXLUAEDITAPP = 0 *************** *** 97,100 **** --- 100,114 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\wat_dll$(WXLIBPOSTFIX) !endif + __app_wxluacan___depname = + !ifeq USE_WXLUACANAPP 1 + __app_wxluacan___depname = ..\..\..\bin\wxluacan.exe + !endif + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = + !ifeq WX_SHARED 0 + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\wat_lib$(WXLIBPOSTFIX) + !endif + !ifeq WX_SHARED 1 + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\wat_dll$(WXLIBPOSTFIX) + !endif ____WX_DEBUG_1 = !ifeq WX_DEBUG 0 *************** *** 111,120 **** ____WX_DEBUG = -od !endif ! ____WX_DEBUG_0 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_0 = -d0 !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_0 = -d2 !endif ____WX_DEBUG_2 = --- 125,134 ---- ____WX_DEBUG = -od !endif ! ____WX_DEBUG_3 = !ifeq WX_DEBUG 0 ! ____WX_DEBUG_3 = -d0 !endif !ifeq WX_DEBUG 1 ! ____WX_DEBUG_3 = -d2 !endif ____WX_DEBUG_2 = *************** *** 169,173 **** -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & --- 183,187 ---- -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_3) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & *************** *** 176,184 **** -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. -i=$(%WXSTEDIT)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj --- 190,213 ---- -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_3) -i=..\..\..\modules -i=.\..\..\.. -i=$(%WXSTEDIT)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.obj + APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & + -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & + -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & + $(____WX_DEBUG_3) -i=..\..\..\modules -i=.\..\..\.. & + -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) + APP_WXLUACAN_OBJECTS = & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj & + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj *************** *** 189,193 **** ### Targets: ### ! all : .SYMBOLIC $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean : .SYMBOLIC --- 218,222 ---- ### Targets: ### ! all : .SYMBOLIC $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) clean : .SYMBOLIC *************** *** 199,202 **** --- 228,232 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe -if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe + -if exist ..\..\..\bin\wxluacan.exe del ..\..\..\bin\wxluacan.exe !ifeq USE_WXLUAAPP 1 *************** *** 226,229 **** --- 256,272 ---- !endif + !ifeq USE_WXLUACANAPP 1 + ..\..\..\bin\wxluacan.exe : $(APP_WXLUACAN_OBJECTS) watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res + @%create watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc + @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc option quiet + @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc name $^@ + @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc option caseexact + @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) system nt_win ref '_WinMain@16' + @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc file %i + @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).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) do @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc library %i + @%append watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc option resource=watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res + wlink @watcom$(WXLIBPOSTFIX)\app_wxluacan.lbc + !endif + watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< *************** *** 244,245 **** --- 287,318 ---- wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____WX_SHARED) -i=..\..\..\modules -i=.\..\..\.. $< + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_class.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_object.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_cansim.obj : .AUTODEPEND ..\..\wxluacan\src\cansim.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_canlua.obj : .AUTODEPEND ..\..\wxluacan\src\canlua.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_define.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_builtin.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_event.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< + + watcom$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.res : .AUTODEPEND ..\..\wxluacan\src\wxluacan.rc + wrc -q -ad -bt=nt -r -fo=$^@ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include $(____WX_SHARED) -i=..\..\..\modules -i=.\..\..\.. $< + Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** makefile.gcc 3 Feb 2006 16:55:47 -0000 1.21 --- makefile.gcc 3 Feb 2006 18:40:50 -0000 1.22 *************** *** 41,44 **** --- 41,47 ---- USE_WXLUAAPP = 1 + # Compile the wxLuaCan app ? [0,1] + USE_WXLUACANAPP = 1 + # Compile the wxLuaEditor app ? [0,1] USE_WXLUAEDITAPP = 0 *************** *** 72,75 **** --- 75,95 ---- mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit.o \ mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o + APP_WXLUACAN_CXXFLAGS = -DHAVE_W32API_H $(__WXUNICODE_DEFINE_p) \ + $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ + -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ + $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) $(____WX_DEBUG_2) \ + -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\wxbind\setup $(CPPFLAGS) \ + $(CXXFLAGS) + APP_WXLUACAN_OBJECTS = \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_cancom.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_cansim.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_canlua.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.o \ + mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_rc.o ### Conditionally set variables: ### *************** *** 96,104 **** __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\gcc_dll$(WXLIBPOSTFIX) endif ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ifeq ($(WX_UNICODE),1) ! __WXUNICODE_DEFINE_p_0 = --define _UNICODE endif ifeq ($(WX_DEBUG),1) --- 116,133 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES_1 = lib\gcc_dll$(WXLIBPOSTFIX) endif + ifeq ($(USE_WXLUACANAPP),1) + __app_wxluacan___depname = ..\..\..\bin\wxluacan.exe + endif + ifeq ($(WX_SHARED),0) + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\gcc_lib$(WXLIBPOSTFIX) + endif + ifeq ($(WX_SHARED),1) + __WXLUA_OUTPUT_FOLDER_FILENAMES_2 = lib\gcc_dll$(WXLIBPOSTFIX) + endif ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ifeq ($(WX_UNICODE),1) ! __WXUNICODE_DEFINE_p_6 = --define _UNICODE endif ifeq ($(WX_DEBUG),1) *************** *** 106,110 **** endif ifeq ($(WX_DEBUG),1) ! __WXDEBUG_DEFINE_p_0 = --define __WXDEBUG__ endif ifeq ($(WX_SHARED),0) --- 135,139 ---- endif ifeq ($(WX_DEBUG),1) ! __WXDEBUG_DEFINE_p_6 = --define __WXDEBUG__ endif ifeq ($(WX_SHARED),0) *************** *** 115,122 **** endif ifeq ($(WX_SHARED),0) ! ____WX_SHARED_0 = endif ifeq ($(WX_SHARED),1) ! ____WX_SHARED_0 = --define WXUSINGDLL endif ifeq ($(WX_DEBUG),0) --- 144,151 ---- endif ifeq ($(WX_SHARED),0) ! ____WX_SHARED_1 = endif ifeq ($(WX_SHARED),1) ! ____WX_SHARED_1 = --define WXUSINGDLL endif ifeq ($(WX_DEBUG),0) *************** *** 167,171 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) clean: --- 196,200 ---- ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) clean: *************** *** 174,177 **** --- 203,207 ---- -if exist ..\..\..\bin\wxlua.exe del ..\..\..\bin\wxlua.exe -if exist ..\..\..\bin\wxluaedit.exe del ..\..\..\bin\wxluaedit.exe + -if exist ..\..\..\bin\wxluacan.exe del ..\..\..\bin\wxluacan.exe ifeq ($(USE_WXLUAAPP),1) *************** *** 185,188 **** --- 215,223 ---- endif + ifeq ($(USE_WXLUACANAPP),1) + ..\..\..\bin\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_rc.o + $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(WXLIBPATH) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES_2) -Wl,--subsystem,windows -mwindows -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind -lwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_lua -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 + endif + mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< *************** *** 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 --include-dir ./../../.. mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp --- 227,231 ---- mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_1) --include-dir ../../../modules --include-dir ./../../.. 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 --include-dir ./../../.. .PHONY: all clean --- 236,270 ---- mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_1) --include-dir ../../../modules --include-dir ./../../.. ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_class.o: ../../wxluacan/src/wxluacan_class.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_object.o: ../../wxluacan/src/wxluacan_object.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_cansim.o: ../../wxluacan/src/cansim.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_canlua.o: ../../wxluacan/src/canlua.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_define.o: ../../wxluacan/src/wxluacan_define.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_builtin.o: ../../wxluacan/src/wxluacan_builtin.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_event.o: ../../wxluacan/src/wxluacan_event.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! mingw$(WXLIBPOSTFIX)\app_wxluacan_wxluacan_rc.o: ../../wxluacan/src/wxluacan.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_6) $(__WXDEBUG_DEFINE_p_6) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____WX_SHARED_1) --include-dir ../../../modules --include-dir ./../../.. .PHONY: all clean |
From: Francesco M. <fr...@us...> - 2006-02-03 18:41:05
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10289/apps Modified Files: Makefile.in Log Message: added wxluacan sample to build system Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Makefile.in 3 Feb 2006 16:55:47 -0000 1.21 --- Makefile.in 3 Feb 2006 18:40:50 -0000 1.22 *************** *** 47,50 **** --- 47,63 ---- app_wxluaedit_wxluaedit.o \ $(__app_wxluaedit___win32rc) + APP_WXLUACAN_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ + -I$(top_srcdir)/modules/wxbind/setup $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) + APP_WXLUACAN_OBJECTS = \ + app_wxluacan_wxluacan.o \ + app_wxluacan_wxluacan_class.o \ + app_wxluacan_cancom.o \ + app_wxluacan_wxluacan_object.o \ + app_wxluacan_cansim.o \ + app_wxluacan_canlua.o \ + app_wxluacan_wxluacan_define.o \ + app_wxluacan_wxluacan_builtin.o \ + app_wxluacan_wxluacan_event.o \ + $(__app_wxluacan___win32rc) ### Conditionally set variables: ### *************** *** 76,91 **** @COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) ! install: all $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) ! uninstall: $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) clean: --- 89,119 ---- @COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o + @COND_USE_WXLUACANAPP_1@__app_wxluacan___depname = \ + @COND_USE_WXLUACANAPP_1@ $(top_builddir)bin/wxluacan$(EXEEXT) + @COND_PLATFORM_MAC_1@__app_wxluacan___mac_setfilecmd = \ + @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL \ + @COND_PLATFORM_MAC_1@ $(top_builddir)bin/wxluacan$(EXEEXT) + COND_PLATFORM_OS2_1___app_wxluacan___os2_emxbindcmd = $(NM) wxluacan$(EXEEXT) \ + | if grep -q pmwin.763 ; then emxbind -ep wxluacan$(EXEEXT) ; fi + @COND_PLATFORM_OS2_1@__app_wxluacan___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___app_wxluacan___os2_emxbindcmd) + @COND_USE_WXLUACANAPP_1@__install_app_wxluacan___depname \ + @COND_USE_WXLUACANAPP_1@ = install_app_wxluacan + @COND_USE_WXLUACANAPP_1@__uninstall_app_wxluacan___depname \ + @COND_USE_WXLUACANAPP_1@ = uninstall_app_wxluacan + @COND_PLATFORM_WIN32_1@__app_wxluacan___win32rc = \ + @COND_PLATFORM_WIN32_1@ app_wxluacan_wxluacan_rc.o ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) ! install: all $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) ! uninstall: $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) + $(STRIP) $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) clean: *************** *** 94,97 **** --- 122,126 ---- rm -f $(top_builddir)bin/wxlua$(EXEEXT) rm -f $(top_builddir)bin/wxluaedit$(EXEEXT) + rm -f $(top_builddir)bin/wxluacan$(EXEEXT) distclean: clean *************** *** 124,127 **** --- 153,169 ---- @COND_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) + @COND_USE_WXLUACANAPP_1@$(top_builddir)bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) + @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) + @COND_USE_WXLUACANAPP_1@ + @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) + @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___os2_emxbindcmd) + + @COND_USE_WXLUACANAPP_1@install_app_wxluacan: + @COND_USE_WXLUACANAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) + @COND_USE_WXLUACANAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluacan$(EXEEXT) $(DESTDIR)$(bindir) + + @COND_USE_WXLUACANAPP_1@uninstall_app_wxluacan: + @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) + app_wxlua_wxlua.o: $(top_srcdir)/apps/wxlua/src/wxlua.cpp $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(top_srcdir)/apps/wxlua/src/wxlua.cpp *************** *** 142,148 **** $(WINDRES) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit --- 184,220 ---- $(WINDRES) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) + app_wxluacan_wxluacan.o: $(top_srcdir)/apps/wxluacan/src/wxluacan.cpp + $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/wxluacan.cpp + + app_wxluacan_wxluacan_class.o: $(top_srcdir)/apps/wxluacan/src/wxluacan_class.cpp + $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/wxluacan_class.cpp + + app_wxluacan_cancom.o: $(top_srcdir)/apps/wxluacan/src/cancom.cpp + $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/cancom.cpp + + app_wxluacan_wxluacan_object.o: $(top_srcdir)/apps/wxluacan/src/wxluacan_object.cpp + $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/wxluacan_object.cpp + + app_wxluacan_cansim.o: $(top_srcdir)/apps/wxluacan/src/cansim.cpp + $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/cansim.cpp + + app_wxluacan_canlua.o: $(top_srcdir)/apps/wxluacan/src/canlua.cpp + $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/canlua.cpp + + app_wxluacan_wxluacan_define.o: $(top_srcdir)/apps/wxluacan/src/wxluacan_define.cpp + $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/wxluacan_define.cpp + + app_wxluacan_wxluacan_builtin.o: $(top_srcdir)/apps/wxluacan/src/wxluacan_builtin.cpp + $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/wxluacan_builtin.cpp + + app_wxluacan_wxluacan_event.o: $(top_srcdir)/apps/wxluacan/src/wxluacan_event.cpp + $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/wxluacan_event.cpp + + app_wxluacan_wxluacan_rc.o: $(top_srcdir)/apps/wxluacan/src/wxluacan.rc + $(WINDRES) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan |
From: Francesco M. <fr...@us...> - 2006-02-03 18:41:04
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10289/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: added wxluacan sample to build system Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** makefile.vc 2 Feb 2006 23:02:29 -0000 1.13 --- makefile.vc 3 Feb 2006 18:40:50 -0000 1.14 *************** *** 65,68 **** --- 65,69 ---- USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ + USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** makefile.bcc 2 Feb 2006 23:02:29 -0000 1.12 --- makefile.bcc 3 Feb 2006 18:40:50 -0000 1.13 *************** *** 105,108 **** --- 105,113 ---- !endif + # Compile the wxLuaCan app ? [0,1] + !ifndef USE_WXLUACANAPP + USE_WXLUACANAPP = 1 + !endif + # Compile the wxLuaEditor app ? [0,1] !ifndef USE_WXLUAEDITAPP *************** *** 126,130 **** -DUSE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ -DUSE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ ! -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ### Conditionally set variables: ### --- 131,136 ---- -DUSE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ -DUSE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" \ ! -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! -DUSE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" ### Conditionally set variables: ### Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** makefile.wat 2 Feb 2006 23:02:29 -0000 1.12 --- makefile.wat 3 Feb 2006 18:40:50 -0000 1.13 *************** *** 107,110 **** --- 107,111 ---- USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" & USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" & + USE_WXLUACANAPP="$(USE_WXLUACANAPP)" & USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** makefile.gcc 2 Feb 2006 23:02:29 -0000 1.12 --- makefile.gcc 3 Feb 2006 18:40:50 -0000 1.13 *************** *** 61,64 **** --- 61,65 ---- USE_BIN2C="$(USE_BIN2C)" USE_WXLUADEBUGLIB="$(USE_WXLUADEBUGLIB)" \ USE_WXLUASOCKETLIB="$(USE_WXLUASOCKETLIB)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ + USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" |
From: Francesco M. <fr...@us...> - 2006-02-03 18:41:04
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10289/build/autoconf Modified Files: autoconf_inc.m4 configure.ac Log Message: added wxluacan sample to build system Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** autoconf_inc.m4 3 Feb 2006 17:06:15 -0000 1.5 --- autoconf_inc.m4 3 Feb 2006 18:40:50 -0000 1.6 *************** *** 49,70 **** fi AC_SUBST(COND_PLATFORM_MAC_1) ! dnl ### begin block 20_COND_PLATFORM_OS2_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_OS2_1="#" ! if test "x$PLATFORM_OS2" = "x1" ; then ! COND_PLATFORM_OS2_1="" ! fi ! AC_SUBST(COND_PLATFORM_OS2_1) ! dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_PLATFORM_WIN32_1="#" ! if test "x$PLATFORM_WIN32" = "x1" ; then ! COND_PLATFORM_WIN32_1="" ! fi ! AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_USE_APPS_1[./wxlua.bkl] ### ! COND_USE_APPS_1="#" ! if test "x$USE_APPS" = "x1" ; then ! COND_USE_APPS_1="" ! fi ! AC_SUBST(COND_USE_APPS_1) dnl ### begin block 20_COND_USE_BIN2C_1[../../util/build/bakefiles/util.bkl] ### COND_USE_BIN2C_1="#" --- 49,70 ---- fi AC_SUBST(COND_PLATFORM_MAC_1) ! dnl ### begin block 20_COND_PLATFORM_OS2_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_OS2_1="#" ! if test "x$PLATFORM_OS2" = "x1" ; then ! COND_PLATFORM_OS2_1="" ! fi ! AC_SUBST(COND_PLATFORM_OS2_1) ! dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_PLATFORM_WIN32_1="#" ! if test "x$PLATFORM_WIN32" = "x1" ; then ! COND_PLATFORM_WIN32_1="" ! fi ! AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_USE_APPS_1[./wxlua.bkl] ### ! COND_USE_APPS_1="#" ! if test "x$USE_APPS" = "x1" ; then ! COND_USE_APPS_1="" ! fi ! AC_SUBST(COND_USE_APPS_1) dnl ### begin block 20_COND_USE_BIN2C_1[../../util/build/bakefiles/util.bkl] ### COND_USE_BIN2C_1="#" *************** *** 103,124 **** fi AC_SUBST(COND_USE_SOVERSOLARIS_1) ! dnl ### begin block 20_COND_USE_UTIL_1[./wxlua.bkl] ### ! COND_USE_UTIL_1="#" ! if test "x$USE_UTIL" = "x1" ; then ! COND_USE_UTIL_1="" ! fi ! AC_SUBST(COND_USE_UTIL_1) ! dnl ### begin block 20_COND_USE_WXLUAAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAAPP_1="#" ! if test "x$USE_WXLUAAPP" = "x1" ; then ! COND_USE_WXLUAAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAAPP_1) ! dnl ### begin block 20_COND_USE_WXLUAEDITAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAEDITAPP_1="#" ! if test "x$USE_WXLUAEDITAPP" = "x1" ; then ! COND_USE_WXLUAEDITAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAEDITAPP_1) dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[../../modules/build/bakefiles/modules.bkl] ### COND_WINDOWS_IMPLIB_1="#" --- 103,130 ---- fi AC_SUBST(COND_USE_SOVERSOLARIS_1) ! dnl ### begin block 20_COND_USE_UTIL_1[./wxlua.bkl] ### ! COND_USE_UTIL_1="#" ! if test "x$USE_UTIL" = "x1" ; then ! COND_USE_UTIL_1="" ! fi ! AC_SUBST(COND_USE_UTIL_1) ! dnl ### begin block 20_COND_USE_WXLUAAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAAPP_1="#" ! if test "x$USE_WXLUAAPP" = "x1" ; then ! COND_USE_WXLUAAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAAPP_1) ! dnl ### begin block 20_COND_USE_WXLUACANAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUACANAPP_1="#" ! if test "x$USE_WXLUACANAPP" = "x1" ; then ! COND_USE_WXLUACANAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUACANAPP_1) ! dnl ### begin block 20_COND_USE_WXLUAEDITAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAEDITAPP_1="#" ! if test "x$USE_WXLUAEDITAPP" = "x1" ; then ! COND_USE_WXLUAEDITAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAEDITAPP_1) dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[../../modules/build/bakefiles/modules.bkl] ### COND_WINDOWS_IMPLIB_1="#" Index: configure.ac =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/configure.ac,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configure.ac 2 Feb 2006 23:02:28 -0000 1.8 --- configure.ac 3 Feb 2006 18:40:50 -0000 1.9 *************** *** 32,35 **** --- 32,38 ---- [AC_HELP_STRING([--enable-wxlua-app], [Compiles the wxLua app (default is yes)])], [], [enable_wxlua_app=yes]) + AC_ARG_ENABLE([wxluacan-app], + [AC_HELP_STRING([--enable-wxluacan-app], [Compiles the wxLuaCan app (default is yes)])], + [], [enable_wxluacan_app=yes]) AC_ARG_ENABLE([wxluaedit-app], [AC_HELP_STRING([--enable-wxluaedit-app], [Compiles the wxLuaEditor app (default is no)])], *************** *** 55,58 **** --- 58,62 ---- AM_YESNO_OPTCHECK([USE_WXLUAAPP], [enable_wxlua_app], [--enable-wxlua-app]) + AM_YESNO_OPTCHECK([USE_WXLUACANAPP], [enable_wxluacan_app], [--enable-wxluacan-app]) AM_YESNO_OPTCHECK([USE_WXLUAEDITAPP], [enable_wxluaedit_app], [--enable-wxluaedit-app]) *************** *** 129,132 **** --- 133,141 ---- echo " - wxLua application DISABLED" fi + if [[ "$USE_WXLUACANAPP" = "1" ]]; then + echo " - wxLuaCan application ENABLED" + else + echo " - wxLuaCan application DISABLED" + fi if [[ "$USE_WXLUAEDITAPP" = "1" ]]; then echo " - wxLuaEdit application ENABLED" |
From: Francesco M. <fr...@us...> - 2006-02-03 18:41:04
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10289/apps/wxluacan/src Modified Files: cansim.cpp Log Message: added wxluacan sample to build system Index: cansim.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/cansim.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cansim.cpp 3 Feb 2006 17:06:15 -0000 1.1 --- cansim.cpp 3 Feb 2006 18:40:50 -0000 1.2 *************** *** 24,28 **** // Include icon header #if defined(__WXGTK__) || defined(__WXMOTIF__) ! #include "mondrian.xpm" #endif --- 24,28 ---- // Include icon header #if defined(__WXGTK__) || defined(__WXMOTIF__) ! #include "art/wxluasmall.xpm" #endif *************** *** 45,49 **** EVT_CLOSE(MyFrame::OnCloseWindow) EVT_TIMER(-1, MyFrame::OnTimer) ! EVT_MENU_RANGE(MenuOption_First, MenuOption_Last, MyFrame::OnOption) EVT_MENU( lua_script, MyFrame::OnRunScript) EVT_MENU( wxID_UNDO, MyFrame::OnUndo) --- 45,49 ---- EVT_CLOSE(MyFrame::OnCloseWindow) EVT_TIMER(-1, MyFrame::OnTimer) ! EVT_MENU_RANGE(MenuOption_First, MenuOption_Last, MyFrame::OnOption) EVT_MENU( lua_script, MyFrame::OnRunScript) EVT_MENU( wxID_UNDO, MyFrame::OnUndo) *************** *** 66,75 **** SetStatusText( _T("Welcome to a2dCanvas sample!") ); ! SetIcon(wxICON(mondrian)); //default 1000,1000 mapping mainCan = m_canvas = new wxlCan( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) ); ! m_interp = wxLuaState(NULL, wxID_ANY); m_interp.SetEventHandler( &wxGetApp() ); --- 66,75 ---- SetStatusText( _T("Welcome to a2dCanvas sample!") ); ! SetIcon(wxICON(wxLuaSmall)); //default 1000,1000 mapping mainCan = m_canvas = new wxlCan( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) ); ! m_interp = wxLuaState(NULL, wxID_ANY); m_interp.SetEventHandler( &wxGetApp() ); *************** *** 131,140 **** menuLogical->Append( Origin_MoveLeft, _T("Move &right\tCtrl-L") ); menuLogical->Append( Origin_MoveRight, _T("Move &left\tCtrl-R") ); ! menuLogical->AppendSeparator(); m_menuObjects = new wxMenu; m_menuObjects->Append( Object_AddRect, _T("Add rectangle") ); m_menuObjects->Append( Object_AddCircle, _T("Add circle") ); ! m_menuObjects->Append( lua_script, _T("Run Script") ); m_menuObjects->AppendSeparator(); --- 131,140 ---- menuLogical->Append( Origin_MoveLeft, _T("Move &right\tCtrl-L") ); menuLogical->Append( Origin_MoveRight, _T("Move &left\tCtrl-R") ); ! menuLogical->AppendSeparator(); m_menuObjects = new wxMenu; m_menuObjects->Append( Object_AddRect, _T("Add rectangle") ); m_menuObjects->Append( Object_AddCircle, _T("Add circle") ); ! m_menuObjects->Append( lua_script, _T("Run Script") ); m_menuObjects->AppendSeparator(); *************** *** 247,251 **** m_canvas->Refresh(); ! } --- 247,251 ---- m_canvas->Refresh(); ! } *************** *** 261,267 **** ); ! if ( !fullPath.IsEmpty() && ::wxFileExists( fullPath ) ) { ! if ( 0 != m_interp.RunFile( fullPath ) ) { wxLogWarning( _("Error in Lua Script") ); --- 261,267 ---- ); ! if ( !fullPath.IsEmpty() && ::wxFileExists( fullPath ) ) { ! if ( 0 != m_interp.RunFile( fullPath ) ) { wxLogWarning( _("Error in Lua Script") ); |
From: Francesco M. <fr...@us...> - 2006-02-03 18:41:04
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10289/apps/build/bakefiles Modified Files: apps.bkl options.bkl Log Message: added wxluacan sample to build system Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/options.bkl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** options.bkl 3 Feb 2006 17:06:15 -0000 1.5 --- options.bkl 3 Feb 2006 18:40:50 -0000 1.6 *************** *** 57,61 **** of the modules to compile will be left to the user... --> <set var="USE_WXLUAAPP">1</set> ! <set var="USE_WXLUACANPP">1</set> <set var="USE_WXLUAEDITAPP">1</set> </if> --- 57,61 ---- of the modules to compile will be left to the user... --> <set var="USE_WXLUAAPP">1</set> ! <set var="USE_WXLUACANAPP">1</set> <set var="USE_WXLUAEDITAPP">1</set> </if> Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** apps.bkl 3 Feb 2006 17:06:15 -0000 1.22 --- apps.bkl 3 Feb 2006 18:40:50 -0000 1.23 *************** *** 60,63 **** --- 60,71 ---- <include file="../../../modules/build/bakefiles/options.bkl"/> + <template id="wxluaapp" template="wxlua"> + <app-type>gui</app-type> + <srcdir>$(WXLUA_APPSDIR)</srcdir> + <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> + <install-to>$(BINDIR)</install-to> + </template> + + <!-- ================================================================== --> *************** *** 67,79 **** <!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use 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> - <exename>wxlua</exename> <win32-res>wxlua/src/wxlua.rc</win32-res> --- 75,82 ---- <!-- NOTE: we need to use a name different from 'wxlua' since 'wxlua' name is already in use as a module target... this would lead to problems when creating global DSW file... --> ! <exe id="app_wxlua" template="wxluaapp" cond="USE_WXLUAAPP=='1'"> <sources>$(WXLUAAPP_SRC)</sources> <headers>$(WXLUAAPP_HDR)</headers> <exename>wxlua</exename> <win32-res>wxlua/src/wxlua.rc</win32-res> *************** *** 87,99 **** <!-- ================================================================== --> ! <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> <win32-res>wxluaedit/src/wxluaedit.rc</win32-res> --- 90,97 ---- <!-- ================================================================== --> ! <exe id="app_wxluaedit" template="wxluaapp" cond="USE_WXLUAEDITAPP=='1'"> <sources>$(WXLUAEDITAPP_SRC)</sources> <headers>$(WXLUAEDITAPP_HDR)</headers> <exename>wxluaedit</exename> <win32-res>wxluaedit/src/wxluaedit.rc</win32-res> *************** *** 119,139 **** <!-- ================================================================== --> ! <exe id="app_wxluacan" template="wxlua" cond="USE_WXLUACANAPP=='1'"> ! <app-type>gui</app-type> ! <srcdir>$(WXLUA_APPSDIR)</srcdir> <sources>$(WXLUACANAPP_SRC)</sources> <headers>$(WXLUACANAPP_HDR)</headers> - <install-to>$(BINDIR)</install-to> - <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> - <exename>wxluacan</exename> <win32-res>wxluacan/src/wxluacan.rc</win32-res> <wxlua-alllibs/> <wx-alllibs/> - </exe> - </makefile> --- 117,133 ---- <!-- ================================================================== --> ! <exe id="app_wxluacan" template="wxluaapp" cond="USE_WXLUACANAPP=='1'"> <sources>$(WXLUACANAPP_SRC)</sources> <headers>$(WXLUACANAPP_HDR)</headers> <exename>wxluacan</exename> <win32-res>wxluacan/src/wxluacan.rc</win32-res> + <!-- This app requires wxluasetup.h path --> + <include>$(WXLUA_BASEDIR)/modules/wxbind/setup</include> + <wxlua-alllibs/> <wx-alllibs/> </exe> </makefile> |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29475/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp fl.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp plot.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_builtin.cpp wx_class.cpp wx_define.cpp wx_event.cpp wx_object.cpp wxlua.cpp xml.cpp Log Message: cleanup the Cpp header info and unify generating them in genwxbind.lua rename wx.rules to wx_rules.lua since it is a lua file Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** xml.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- xml.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dialogs.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- dialogs.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlua.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- wxlua.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** image.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- image.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mdi.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- mdi.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config.cpp 2 Feb 2006 16:07:45 -0000 1.1 --- config.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** grid.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- grid.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** file.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- file.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: wx_object.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_object.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wx_object.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- wx_object.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wxLuaGetObjectList_wx() is called by registerGeneratedClasses() ! // to register object and pointer bindings ! // ! // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! #include "wx/wxprec.h" --- 1,11 ---- ! // ---------------------------------------------------------------------------- ! // wxLuaGetObjectList_wx() is called to register object and pointer bindings ! // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // This file was generated by genwxbind.lua + // + // Any changes made to this file may be lost when file is regenerated. + // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 17,27 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 15,24 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** data.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- data.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: regex.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/regex.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** regex.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- regex.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** controls.cpp 2 Feb 2006 16:07:45 -0000 1.1 --- controls.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: plot.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/plot.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plot.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- plot.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: wx_define.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_define.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wx_define.cpp 3 Feb 2006 04:53:57 -0000 1.2 --- wx_define.cpp 3 Feb 2006 17:13:30 -0000 1.3 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wxLuaGetDefineList_wx() is called by registerGeneratedClasses() ! // to register defines, enums and static strings ! // ! // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! #include "wx/wxprec.h" --- 1,11 ---- ! // ---------------------------------------------------------------------------- ! // wxLuaGetDefineList_wx() is called to register defines, enums, and strings ! // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // This file was generated by genwxbind.lua + // + // Any changes made to this file may be lost when file is regenerated. + // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 17,27 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 15,24 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: socket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/socket.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** socket.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- socket.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/clipdrag.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** clipdrag.cpp 2 Feb 2006 16:07:45 -0000 1.1 --- clipdrag.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: sizer.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/sizer.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sizer.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- sizer.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: fl.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/fl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** fl.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- fl.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** defsutil.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- defsutil.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: wx_builtin.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_builtin.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wx_builtin.cpp 3 Feb 2006 15:59:27 -0000 1.2 --- wx_builtin.cpp 3 Feb 2006 17:13:30 -0000 1.3 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wxLuaGetBuiltinList_wx() is called by registerGeneratedClasses() ! // to register object and pointer bindings ! // ! // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! #include "wx/wxprec.h" --- 1,11 ---- ! // ---------------------------------------------------------------------------- ! // wxLuaGetBuiltinList_wx() is called to register global functions ! // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // This file was generated by genwxbind.lua + // + // Any changes made to this file may be lost when file is regenerated. + // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 17,27 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 15,24 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/html.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** html.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- html.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gdi.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- gdi.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: wx_class.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_class.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wx_class.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- wx_class.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wxLuaGetClassList_wx() is called by registerGeneratedClasses() ! // to register classes ! // ! // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! #include "wx/wxprec.h" --- 1,11 ---- ! // ---------------------------------------------------------------------------- ! // wxLuaGetClassList_wx() is called to register classes ! // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // This file was generated by genwxbind.lua + // + // Any changes made to this file may be lost when file is regenerated. + // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 21,27 **** #endif - - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 19,24 ---- #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** print.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- print.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: help.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/help.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- help.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** appframe.cpp 2 Feb 2006 16:07:45 -0000 1.1 --- appframe.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** datetime.cpp 2 Feb 2006 16:12:42 -0000 1.1 --- datetime.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: wx_event.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_event.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wx_event.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- wx_event.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wxLuaGetEventList_wx() is called by registerGeneratedClasses() ! // to register events ! // ! // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! #include "wx/wxprec.h" --- 1,11 ---- ! // ---------------------------------------------------------------------------- ! // wxLuaGetEventList_wx() is called to register events ! // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // This file was generated by genwxbind.lua + // + // Any changes made to this file may be lost when file is regenerated. + // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 17,27 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 15,24 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: event.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/event.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** event.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- event.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** windows.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- windows.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: menutool.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/menutool.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** menutool.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- menutool.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: wave.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wave.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wave.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- wave.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: thread.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/thread.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** thread.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- thread.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" Index: geometry.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/geometry.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** geometry.cpp 2 Feb 2006 16:07:47 -0000 1.1 --- geometry.cpp 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbind/include/wxbind.h" |
From: John L. <jr...@us...> - 2006-02-03 17:13:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29475/wxLua/modules/wxbindstc/src Modified Files: stc.cpp wxstc_builtin.cpp wxstc_class.cpp wxstc_define.cpp wxstc_event.cpp wxstc_object.cpp Log Message: cleanup the Cpp header info and unify generating them in genwxbind.lua rename wx.rules to wx_rules.lua since it is a lua file Index: wxstc_define.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_define.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxstc_define.cpp 2 Feb 2006 16:11:33 -0000 1.1 --- wxstc_define.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wxLuaGetDefineList_wxstc() is called by registerGeneratedClasses() ! // to register defines, enums and static strings ! // ! // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! #include "wx/wxprec.h" --- 1,11 ---- ! // ---------------------------------------------------------------------------- ! // wxLuaGetDefineList_wxstc() is called to register defines, enums, and strings ! // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // This file was generated by genwxbind.lua + // + // Any changes made to this file may be lost when file is regenerated. + // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 17,27 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbindstc/include/wxbind.h" --- 15,24 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbindstc/include/wxbind.h" Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stc.cpp 2 Feb 2006 17:05:42 -0000 1.2 --- stc.cpp 3 Feb 2006 17:13:30 -0000 1.3 *************** *** 1,10 **** ! // --------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #include "wx/wxprec.h" --- 1,7 ---- ! // ---------------------------------------------------------------------------- // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file is regenerated. ! // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 14,24 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbindstc/include/wxbind.h" --- 11,20 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbindstc/include/wxbind.h" Index: wxstc_builtin.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_builtin.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxstc_builtin.cpp 3 Feb 2006 15:59:27 -0000 1.3 --- wxstc_builtin.cpp 3 Feb 2006 17:13:30 -0000 1.4 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wxLuaGetBuiltinList_wxstc() is called by registerGeneratedClasses() ! // to register object and pointer bindings ! // ! // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! #include "wx/wxprec.h" --- 1,11 ---- ! // ---------------------------------------------------------------------------- ! // wxLuaGetBuiltinList_wxstc() is called to register global functions ! // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // This file was generated by genwxbind.lua + // + // Any changes made to this file may be lost when file is regenerated. + // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 17,27 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbindstc/include/wxbind.h" --- 15,24 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbindstc/include/wxbind.h" Index: wxstc_event.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_event.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxstc_event.cpp 2 Feb 2006 16:11:33 -0000 1.1 --- wxstc_event.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wxLuaGetEventList_wxstc() is called by registerGeneratedClasses() ! // to register events ! // ! // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! #include "wx/wxprec.h" --- 1,11 ---- ! // ---------------------------------------------------------------------------- ! // wxLuaGetEventList_wxstc() is called to register events ! // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // This file was generated by genwxbind.lua + // + // Any changes made to this file may be lost when file is regenerated. + // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 17,27 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbindstc/include/wxbind.h" --- 15,24 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbindstc/include/wxbind.h" Index: wxstc_object.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_object.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxstc_object.cpp 2 Feb 2006 16:11:33 -0000 1.1 --- wxstc_object.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wxLuaGetObjectList_wxstc() is called by registerGeneratedClasses() ! // to register object and pointer bindings ! // ! // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! #include "wx/wxprec.h" --- 1,11 ---- ! // ---------------------------------------------------------------------------- ! // wxLuaGetObjectList_wxstc() is called to register object and pointer bindings ! // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // This file was generated by genwxbind.lua + // + // Any changes made to this file may be lost when file is regenerated. + // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 17,27 **** #endif - #ifndef WX_PRECOMP #include "wx/wx.h" #endif - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbindstc/include/wxbind.h" --- 15,24 ---- #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxlua/include/internal.h" + #include "wxbindstc/include/wxbind.h" Index: wxstc_class.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/wxstc_class.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxstc_class.cpp 2 Feb 2006 16:11:33 -0000 1.1 --- wxstc_class.cpp 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wxLuaGetClassList_wxstc() is called by registerGeneratedClasses() ! // to register classes ! // ! // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! #include "wx/wxprec.h" --- 1,11 ---- ! // ---------------------------------------------------------------------------- ! // wxLuaGetClassList_wxstc() is called to register classes ! // ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- + // This file was generated by genwxbind.lua + // + // Any changes made to this file may be lost when file is regenerated. + // ---------------------------------------------------------------------------- #include "wx/wxprec.h" *************** *** 21,27 **** #endif - - #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxbindstc/include/wxbind.h" --- 19,24 ---- #endif #include "wxlua/include/internal.h" + #include "wxbindstc/include/wxbind.h" |
From: John L. <jr...@us...> - 2006-02-03 17:13:39
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29475/wxLua/bindings Modified Files: genwxbind.bat genwxbind.lua Log Message: cleanup the Cpp header info and unify generating them in genwxbind.lua rename wx.rules to wx_rules.lua since it is a lua file Index: genwxbind.bat =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** genwxbind.bat 3 Feb 2006 15:59:27 -0000 1.4 --- genwxbind.bat 3 Feb 2006 17:13:00 -0000 1.5 *************** *** 1,9 **** @echo off ! REM This batch generates codedragon wxbind c++ source files from interface files REM @echo on SET LUA=..\bin\lua.exe echo Generating wxWidgets Binding ! %LUA% -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets\error.txt %LUA% -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc\error.txt echo Done. --- 1,10 ---- @echo off ! REM This batch generates all the wxLua C++ source files from interface files. ! REM The C++ source files are only modified if any changes have been made. REM @echo on SET LUA=..\bin\lua.exe echo Generating wxWidgets Binding ! %LUA% -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets\error.txt %LUA% -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc\error.txt echo Done. Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** genwxbind.lua 3 Feb 2006 15:59:27 -0000 1.22 --- genwxbind.lua 3 Feb 2006 17:13:00 -0000 1.23 *************** *** 3456,3472 **** local fileData = {} ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_cpp_namespace..".h\n") ! table.insert(fileData, "// headers and tag for wxLua binding\n") ! table.insert(fileData, "// \n") table.insert(fileData, "// This file was generated by genwxbind.lua \n") ! table.insert(fileData, "// \n") ! table.insert(fileData, "// Any changes made to this file may be lost when file \n") ! table.insert(fileData, "// is regenerated \n") ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "\n\n\n") table.insert(fileData, "#ifndef __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n") table.insert(fileData, "#define __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n\n") - table.insert(fileData, "#include \"wxlua/include/internal.h\"\n\n") --- 3456,3468 ---- local fileData = {} ! table.insert(fileData, "// ----------------------------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_cpp_namespace..".h - headers and tags for wxLua binding\n") ! table.insert(fileData, "//\n") table.insert(fileData, "// This file was generated by genwxbind.lua \n") ! table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated\n") ! table.insert(fileData, "// ----------------------------------------------------------------------------\n") ! table.insert(fileData, "\n") table.insert(fileData, "#ifndef __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n") table.insert(fileData, "#define __HOOK_WXLUA_"..hook_cpp_namespace.."_H__\n\n") table.insert(fileData, "#include \"wxlua/include/internal.h\"\n\n") *************** *** 3606,3624 **** -------------------------------------------------------------------------- ! -- Write GetClassList Hook File -------------------------------------------------------------------------- - function GenerateHookClassFileTable() - local fileData = {} ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_class_fn.."() is called by registerGeneratedClasses()\n") ! table.insert(fileData, "// to register classes\n") ! table.insert(fileData, "// \n") table.insert(fileData, "// This file was generated by genwxbind.lua \n") ! table.insert(fileData, "// \n") ! table.insert(fileData, "// Any changes made to this file may be lost when file \n") ! table.insert(fileData, "// is regenerated \n") ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "\n\n\n") table.insert(fileData, hook_header_includes) table.insert(fileData, "\n") --- 3602,3615 ---- -------------------------------------------------------------------------- ! -- Write the header (top part) of the Cpp files -------------------------------------------------------------------------- ! function GenerateHookCppFileHeader(fileData) ! table.insert(fileData, "// ----------------------------------------------------------------------------\n") table.insert(fileData, "// This file was generated by genwxbind.lua \n") ! table.insert(fileData, "//\n") ! table.insert(fileData, "// Any changes made to this file may be lost when file is regenerated.\n") ! table.insert(fileData, "// ----------------------------------------------------------------------------\n") ! table.insert(fileData, "\n") table.insert(fileData, hook_header_includes) table.insert(fileData, "\n") *************** *** 3631,3637 **** table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") ! table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") if includeList then for idx = 1, table.getn(includeList) do --- 3622,3627 ---- table.insert(fileData, "#endif\n") table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxlua/include/internal.h\"\n\n") ! if includeList then for idx = 1, table.getn(includeList) do *************** *** 3642,3645 **** --- 3632,3649 ---- table.insert(fileData, "\n\n") + return fileData + end + + -------------------------------------------------------------------------- + -- Write GetClassList Hook File + -------------------------------------------------------------------------- + function GenerateHookClassFileTable() + local fileData = {} + + table.insert(fileData, "// ----------------------------------------------------------------------------\n") + table.insert(fileData, "// "..hook_class_fn.."() is called to register classes\n") + table.insert(fileData, "// ----------------------------------------------------------------------------\n\n") + fileData = GenerateHookCppFileHeader(fileData) + if hook_bind_condition then table.insert(fileData, "#if "..hook_bind_condition.."\n\n") *************** *** 3782,3816 **** local fileData = {} ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_define_fn.."() is called by registerGeneratedClasses()\n") ! table.insert(fileData, "// to register defines, enums and static strings \n") ! table.insert(fileData, "// \n") ! table.insert(fileData, "// This file was generated by genwxbind.lua \n") ! table.insert(fileData, "// \n") ! table.insert(fileData, "// Any changes made to this file may be lost when file \n") ! table.insert(fileData, "// is regenerated \n") ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "\n\n\n") ! table.insert(fileData, hook_header_includes) ! table.insert(fileData, "\n") ! table.insert(fileData, "#ifdef __BORLANDC__\n") ! table.insert(fileData, " #pragma hdrstop\n") ! table.insert(fileData, "#endif\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "#ifndef WX_PRECOMP\n") ! table.insert(fileData, " #include \"wx/wx.h\"\n") ! table.insert(fileData, "#endif\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") ! table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") ! if includeList then ! for idx = 1, table.getn(includeList) do ! table.insert(fileData, "#include \""..includeList[idx].."\"\n") ! end ! end ! table.insert(fileData, "#include \""..hook_header_file.."\"\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "\n") -- /////////////////////////////////////////////////////////////////////////////////////////////////// --- 3786,3793 ---- local fileData = {} ! table.insert(fileData, "// ----------------------------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_define_fn.."() is called to register defines, enums, and strings\n") ! table.insert(fileData, "// ----------------------------------------------------------------------------\n\n") ! fileData = GenerateHookCppFileHeader(fileData) -- /////////////////////////////////////////////////////////////////////////////////////////////////// *************** *** 3897,3931 **** local fileData = {} ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_object_fn.."() is called by registerGeneratedClasses()\n") ! table.insert(fileData, "// to register object and pointer bindings \n") ! table.insert(fileData, "// \n") ! table.insert(fileData, "// This file was generated by genwxbind.lua \n") ! table.insert(fileData, "// \n") ! table.insert(fileData, "// Any changes made to this file may be lost when file \n") ! table.insert(fileData, "// is regenerated \n") ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "\n\n\n") ! table.insert(fileData, hook_header_includes) ! table.insert(fileData, "\n") ! table.insert(fileData, "#ifdef __BORLANDC__\n") ! table.insert(fileData, " #pragma hdrstop\n") ! table.insert(fileData, "#endif\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "#ifndef WX_PRECOMP\n") ! table.insert(fileData, " #include \"wx/wx.h\"\n") ! table.insert(fileData, "#endif\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") ! table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") ! if includeList then ! for idx = 1, table.getn(includeList) do ! table.insert(fileData, "#include \""..includeList[idx].."\"\n") ! end ! end ! table.insert(fileData, "#include \""..hook_header_file.."\"\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "\n") -- /////////////////////////////////////////////////////////////////////// --- 3874,3881 ---- local fileData = {} ! table.insert(fileData, "// ----------------------------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_object_fn.."() is called to register object and pointer bindings\n") ! table.insert(fileData, "// ----------------------------------------------------------------------------\n\n") ! fileData = GenerateHookCppFileHeader(fileData) -- /////////////////////////////////////////////////////////////////////// *************** *** 3984,4017 **** local fileData = {} ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_event_fn.."() is called by registerGeneratedClasses()\n") ! table.insert(fileData, "// to register events \n") ! table.insert(fileData, "// \n") ! table.insert(fileData, "// This file was generated by genwxbind.lua \n") ! table.insert(fileData, "// \n") ! table.insert(fileData, "// Any changes made to this file may be lost when file \n") ! table.insert(fileData, "// is regenerated \n") ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "\n\n\n") ! table.insert(fileData, hook_header_includes) ! table.insert(fileData, "\n") ! table.insert(fileData, "#ifdef __BORLANDC__\n") ! table.insert(fileData, " #pragma hdrstop\n") ! table.insert(fileData, "#endif\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "#ifndef WX_PRECOMP\n") ! table.insert(fileData, " #include \"wx/wx.h\"\n") ! table.insert(fileData, "#endif\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") ! table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") ! if includeList then ! for idx = 1, table.getn(includeList) do ! table.insert(fileData, "#include \""..includeList[idx].."\"\n") ! end ! end ! table.insert(fileData, "#include \""..hook_header_file.."\"\n") ! table.insert(fileData, "\n\n") -- /////////////////////////////////////////////////////////////////////// --- 3934,3941 ---- local fileData = {} ! table.insert(fileData, "// ----------------------------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_event_fn.."() is called to register events\n") ! table.insert(fileData, "// ----------------------------------------------------------------------------\n\n") ! fileData = GenerateHookCppFileHeader(fileData) -- /////////////////////////////////////////////////////////////////////// *************** *** 4054,4088 **** local fileData = {} ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_builtin_fn.."() is called by registerGeneratedClasses()\n") ! table.insert(fileData, "// to register object and pointer bindings \n") ! table.insert(fileData, "// \n") ! table.insert(fileData, "// This file was generated by genwxbind.lua \n") ! table.insert(fileData, "// \n") ! table.insert(fileData, "// Any changes made to this file may be lost when file \n") ! table.insert(fileData, "// is regenerated \n") ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "\n\n\n") ! table.insert(fileData, hook_header_includes) ! table.insert(fileData, "\n") ! table.insert(fileData, "#ifdef __BORLANDC__\n") ! table.insert(fileData, " #pragma hdrstop\n") ! table.insert(fileData, "#endif\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "#ifndef WX_PRECOMP\n") ! table.insert(fileData, " #include \"wx/wx.h\"\n") ! table.insert(fileData, "#endif\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") ! table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") ! if includeList then ! for idx = 1, table.getn(includeList) do ! table.insert(fileData, "#include \""..includeList[idx].."\"\n") ! end ! end ! table.insert(fileData, "#include \""..hook_header_file.."\"\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "\n") for condition, builtinBindingList in builtinBindingTable do --- 3978,3985 ---- local fileData = {} ! table.insert(fileData, "// ----------------------------------------------------------------------------\n") ! table.insert(fileData, "// "..hook_builtin_fn.."() is called to register global functions\n") ! table.insert(fileData, "// ----------------------------------------------------------------------------\n\n") ! fileData = GenerateHookCppFileHeader(fileData) for condition, builtinBindingList in builtinBindingTable do *************** *** 4151,4181 **** local fileData = {} ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "// This file was generated by genwxbind.lua \n") ! table.insert(fileData, "// \n") ! table.insert(fileData, "// Any changes made to this file may be lost when file \n") ! table.insert(fileData, "// is regenerated \n") ! table.insert(fileData, "// ---------------------------------------------------------\n") ! table.insert(fileData, "\n\n\n") ! table.insert(fileData, hook_header_includes) ! table.insert(fileData, "\n") ! table.insert(fileData, "#ifdef __BORLANDC__\n") ! table.insert(fileData, " #pragma hdrstop\n") ! table.insert(fileData, "#endif\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "#ifndef WX_PRECOMP\n") ! table.insert(fileData, " #include \"wx/wx.h\"\n") ! table.insert(fileData, "#endif\n") ! table.insert(fileData, "\n") ! table.insert(fileData, "#include \"wxluasetup.h\"\n") ! table.insert(fileData, "#include \"wxlua/include/internal.h\"\n") ! if includeList then ! for idx = 1, table.getn(includeList) do ! table.insert(fileData, "#include \""..includeList[idx].."\"\n") ! end ! end ! table.insert(fileData, "#include \""..hook_header_file.."\"\n") ! table.insert(fileData, "\n\n") for k, v in interface.includeFiles do --- 4048,4052 ---- local fileData = {} ! fileData = GenerateHookCppFileHeader(fileData) for k, v in interface.includeFiles do |
From: John L. <jr...@us...> - 2006-02-03 17:13:38
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29475/wxLua/bindings/wxwidgets Modified Files: Makefile Added Files: wx_rules.lua Removed Files: wx.rules Log Message: cleanup the Cpp header info and unify generating them in genwxbind.lua rename wx.rules to wx_rules.lua since it is a lua file Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 3 Feb 2006 04:53:57 -0000 1.4 --- Makefile 3 Feb 2006 17:13:29 -0000 1.5 *************** *** 18,22 **** genwxbind: $(DEPFILES) ! @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx.rules\"" genwxbind.lua > wxwidgets/error.txt) # do nothing to clean --- 18,22 ---- genwxbind: $(DEPFILES) ! @(cd $(WXLUA_DIR)/bindings && ../bin/lua -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt) # do nothing to clean --- NEW FILE: wx_rules.lua --- ------------------------------------------------------------------------------- -- rules to build wxWidgets binding for wxLua (for genwxbind.lua) ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxlua_dir = "../" --cdluapath=wxlua_dir.."/parts/cdlua/" -- FIXME see genwxbind for this ------------------------------------------------------------------------------- -- Set the bindings directory that contains the *.i interface files interface_dir = wxlua_dir.."/bindings/wxwidgets" -- Set the directory to output the bindings to, both C++ header and source files output_dir = wxlua_dir.."/modules/wxbind/src" output_header_dir = wxlua_dir.."/modules/wxbind/include" ------------------------------------------------------------------------------- -- Set the lua namespace that the bindings will be placed, eg. wx.wxWindow(...) hook_lua_namespace = "wx" -- Set the C++ "namespace" that the bindings will be placed, eg. function names -- contain this to prevent duplicate function names hook_cpp_namespace = "wx" -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated file or "" for none hook_header_includes = "#include \"wx/wxprec.h\"\n" -- Set the name of the subclassed wxLuaBinding class hook_binding_class = hook_cpp_namespace.."_Binding" ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_header_file" in the C++ -- wrapper files, so it must include the proper #include path. hook_header_file = "wxbind/include/wxbind.h" ------------------------------------------------------------------------------- -- Set the files to output the structs of wrapped defined values, objects, -- events, builtin (static functionc), and classes hook_define_file = hook_cpp_namespace.."_define" hook_define_fn = "wxLuaGetDefineList_"..hook_cpp_namespace hook_object_file = hook_cpp_namespace.."_object" hook_object_fn = "wxLuaGetObjectList_"..hook_cpp_namespace hook_event_file = hook_cpp_namespace.."_event" hook_event_fn = "wxLuaGetEventList_"..hook_cpp_namespace hook_builtin_file = hook_cpp_namespace.."_builtin" hook_builtin_fn = "wxLuaGetBuiltinList_"..hook_cpp_namespace hook_class_file = hook_cpp_namespace.."_class" hook_class_fn = "wxLuaGetClassList_"..hook_cpp_namespace ------------------------------------------------------------------------------- -- generate comments into code comment = true ------------------------------------------------------------------------------- -- Set the file that contains bindings that need to be overridden override_file = "override.hpp" ------------------------------------------------------------------------------- -- list of interface files to use to make the bindings in the "interfacedir" interfaceFileList = { "appframe.i", "clipdrag.i", "config.i", "controls.i", "data.i", "datetime.i", "defsutil.i", "dialogs.i", "event.i", "file.i", "fl.i", "gdi.i", "geometry.i", "grid.i", "help.i", "html.i", "image.i", "mdi.i", "menutool.i", "plot.i", "print.i", "regex.i", "sizer.i", "socket.i", "thread.i", "wave.i", "windows.i", "wxlua.i", "xml.i", } ------------------------------------------------------------------------------- -- a table containing filenames of DataTypes.Cache.lua from other wrappers to -- to define classes and data types used in this wrapper -- NOTE: for the base wxWidgets wrappers we don't load the cache since they -- don't depend on other wrappers and can cause problems when interface -- files are updated. Make sure you delete or have updated any cache file -- that changes any data types. --dataTypeCacheFilenames = { "wxwidgets/DataTypes.Cache.lua" } ------------------------------------------------------------------------------- -- virtual wxLuaBinding::OnRegister body - can load extra lua bindings here onregister = { " wxLuaState wxLS(wxlState);\n", " wxCHECK_RET(wxLS.Ok(), wxT(\"Invalid wxLuaState\"));\n", "\n", " // register wxNull\n", " if (registerTypes)\n", " {\n", " wxLS.GetLuaStateRefData()->m_wxLuaNull = wxLS.tnewtag();\n", " }\n", "\n", " tpushwxLuaNull(wxLS.GetLuaState());\n", " wxLS.tpushusertag(NULL, wxLS.GetLuaStateRefData()->m_wxLuaNull);\n", " lua_rawset(wxLS.GetLuaState(), luaTable);\n", } ------------------------------------------------------------------------------- -- Add additional include information for binding header file -- This code will be place directly after any #includes at the top of the file headerCPPCode = "#include \"wx/defs.h\"\n".. "#include \"wxluasetup.h\"\n".. "#ifndef wxUSE_WAVE\n#define wxUSE_WAVE 0\n#endif\n".. "#ifndef wxUSE_SOUND\n#define wxUSE_SOUND 0\n#endif\n" ------------------------------------------------------------------------------- -- Add additional conditions here -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ------------------------------------------------------------------------------- -- Add additional data types here -- example: dataTypes["wxArrayInt"] = AllocDataType("wxArrayInt", "class",false) --- wx.rules DELETED --- |
From: John L. <jr...@us...> - 2006-02-03 17:13:38
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29475/wxLua/modules/wxbindstc/include Modified Files: wxbind.h Log Message: cleanup the Cpp header info and unify generating them in genwxbind.lua rename wx.rules to wx_rules.lua since it is a lua file Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/include/wxbind.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxbind.h 2 Feb 2006 16:11:33 -0000 1.1 --- wxbind.h 3 Feb 2006 17:13:30 -0000 1.2 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wxstc.h ! // headers and tag for wxLua binding ! // // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #ifndef __HOOK_WXLUA_wxstc_H__ --- 1,8 ---- ! // ---------------------------------------------------------------------------- ! // wxstc.h - headers and tags for wxLua binding ! // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated ! // ---------------------------------------------------------------------------- #ifndef __HOOK_WXLUA_wxstc_H__ |
From: John L. <jr...@us...> - 2006-02-03 17:13:38
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29475/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: cleanup the Cpp header info and unify generating them in genwxbind.lua rename wx.rules to wx_rules.lua since it is a lua file Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxbind.h 2 Feb 2006 16:07:45 -0000 1.1 --- wxbind.h 3 Feb 2006 17:13:29 -0000 1.2 *************** *** 1,13 **** ! // --------------------------------------------------------- ! // wx.h ! // headers and tag for wxLua binding ! // // This file was generated by genwxbind.lua ! // ! // Any changes made to this file may be lost when file ! // is regenerated ! // --------------------------------------------------------- ! ! #ifndef __HOOK_WXLUA_wx_H__ --- 1,8 ---- ! // ---------------------------------------------------------------------------- ! // wx.h - headers and tags for wxLua binding ! // // This file was generated by genwxbind.lua ! // Any changes made to this file may be lost when file is regenerated ! // ---------------------------------------------------------------------------- #ifndef __HOOK_WXLUA_wx_H__ *************** *** 17,20 **** --- 12,16 ---- #include "wx/defs.h" + #include "wxluasetup.h" #ifndef wxUSE_WAVE #define wxUSE_WAVE 0 |
From: Klaas H. <ti...@us...> - 2006-02-03 17:06:33
|
Update of /cvsroot/wxlua/wxLua/build/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27363/build/autoconf Modified Files: autoconf_inc.m4 Log Message: added wxluacan Index: autoconf_inc.m4 =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/autoconf/autoconf_inc.m4,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** autoconf_inc.m4 23 Jan 2006 19:38:29 -0000 1.4 --- autoconf_inc.m4 3 Feb 2006 17:06:15 -0000 1.5 *************** *** 19,46 **** fi AC_SUBST(COND_DEPS_TRACKING_1) ! dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#" ! if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERCYGWIN" = "x0" -a "x$USE_SOVERSION" = "x1" ; then ! COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="" ! fi ! AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#" ! if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then ! COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="" ! fi ! AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_MACOSX_1="#" ! if test "x$PLATFORM_MACOSX" = "x1" ; then ! COND_PLATFORM_MACOSX_1="" ! fi ! AC_SUBST(COND_PLATFORM_MACOSX_1) ! dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" ! if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then ! COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" ! fi ! AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) dnl ### begin block 20_COND_PLATFORM_MAC_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl] ### COND_PLATFORM_MAC_1="#" --- 19,46 ---- fi AC_SUBST(COND_DEPS_TRACKING_1) ! dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#" ! if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERCYGWIN" = "x0" -a "x$USE_SOVERSION" = "x1" ; then ! COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="" ! fi ! AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#" ! if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then ! COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="" ! fi ! AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1) ! dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_MACOSX_1="#" ! if test "x$PLATFORM_MACOSX" = "x1" ; then ! COND_PLATFORM_MACOSX_1="" ! fi ! AC_SUBST(COND_PLATFORM_MACOSX_1) ! dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" ! if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then ! COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" ! fi ! AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1) dnl ### begin block 20_COND_PLATFORM_MAC_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl,../../util/build/bakefiles/util.bkl] ### COND_PLATFORM_MAC_1="#" *************** *** 49,70 **** fi AC_SUBST(COND_PLATFORM_MAC_1) ! dnl ### begin block 20_COND_PLATFORM_OS2_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_OS2_1="#" ! if test "x$PLATFORM_OS2" = "x1" ; then ! COND_PLATFORM_OS2_1="" ! fi ! AC_SUBST(COND_PLATFORM_OS2_1) ! dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_PLATFORM_WIN32_1="#" ! if test "x$PLATFORM_WIN32" = "x1" ; then ! COND_PLATFORM_WIN32_1="" ! fi ! AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_USE_APPS_1[./wxlua.bkl] ### ! COND_USE_APPS_1="#" ! if test "x$USE_APPS" = "x1" ; then ! COND_USE_APPS_1="" ! fi ! AC_SUBST(COND_USE_APPS_1) dnl ### begin block 20_COND_USE_BIN2C_1[../../util/build/bakefiles/util.bkl] ### COND_USE_BIN2C_1="#" --- 49,70 ---- fi AC_SUBST(COND_PLATFORM_MAC_1) ! dnl ### begin block 20_COND_PLATFORM_OS2_1[../../apps/build/bakefiles/apps.bkl,../../modules/build/bakefiles/modules.bkl] ### ! COND_PLATFORM_OS2_1="#" ! if test "x$PLATFORM_OS2" = "x1" ; then ! COND_PLATFORM_OS2_1="" ! fi ! AC_SUBST(COND_PLATFORM_OS2_1) ! dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_PLATFORM_WIN32_1="#" ! if test "x$PLATFORM_WIN32" = "x1" ; then ! COND_PLATFORM_WIN32_1="" ! fi ! AC_SUBST(COND_PLATFORM_WIN32_1) ! dnl ### begin block 20_COND_USE_APPS_1[./wxlua.bkl] ### ! COND_USE_APPS_1="#" ! if test "x$USE_APPS" = "x1" ; then ! COND_USE_APPS_1="" ! fi ! AC_SUBST(COND_USE_APPS_1) dnl ### begin block 20_COND_USE_BIN2C_1[../../util/build/bakefiles/util.bkl] ### COND_USE_BIN2C_1="#" *************** *** 73,140 **** fi AC_SUBST(COND_USE_BIN2C_1) ! dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_USE_SOSYMLINKS_1="#" ! if test "x$USE_SOSYMLINKS" = "x1" ; then ! COND_USE_SOSYMLINKS_1="" ! fi ! AC_SUBST(COND_USE_SOSYMLINKS_1) ! dnl ### begin block 20_COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#" ! if test "x$USE_SOVERCYGWIN" = "x1" -a "x$USE_SOVERSION" = "x1" ; then ! COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="" ! fi ! AC_SUBST(COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1) ! dnl ### begin block 20_COND_USE_SOVERLINUX_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_USE_SOVERLINUX_1="#" ! if test "x$USE_SOVERLINUX" = "x1" ; then ! COND_USE_SOVERLINUX_1="" ! fi ! AC_SUBST(COND_USE_SOVERLINUX_1) ! dnl ### begin block 20_COND_USE_SOVERSION_0[../../modules/build/bakefiles/modules.bkl] ### ! COND_USE_SOVERSION_0="#" ! if test "x$USE_SOVERSION" = "x0" ; then ! COND_USE_SOVERSION_0="" ! fi ! AC_SUBST(COND_USE_SOVERSION_0) ! dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_USE_SOVERSOLARIS_1="#" ! if test "x$USE_SOVERSOLARIS" = "x1" ; then ! COND_USE_SOVERSOLARIS_1="" ! fi ! AC_SUBST(COND_USE_SOVERSOLARIS_1) ! dnl ### begin block 20_COND_USE_UTIL_1[./wxlua.bkl] ### ! COND_USE_UTIL_1="#" ! if test "x$USE_UTIL" = "x1" ; then ! COND_USE_UTIL_1="" ! fi ! AC_SUBST(COND_USE_UTIL_1) ! dnl ### begin block 20_COND_USE_WXLUAAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAAPP_1="#" ! if test "x$USE_WXLUAAPP" = "x1" ; then ! COND_USE_WXLUAAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAAPP_1) ! dnl ### begin block 20_COND_USE_WXLUAEDITAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAEDITAPP_1="#" ! if test "x$USE_WXLUAEDITAPP" = "x1" ; then ! COND_USE_WXLUAEDITAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAEDITAPP_1) ! dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_WINDOWS_IMPLIB_1="#" ! if test "x$WINDOWS_IMPLIB" = "x1" ; then ! COND_WINDOWS_IMPLIB_1="" ! fi ! AC_SUBST(COND_WINDOWS_IMPLIB_1) ! dnl ### begin block 20_COND_WX_SHARED_0[../../modules/build/bakefiles/modules.bkl] ### ! COND_WX_SHARED_0="#" ! if test "x$WX_SHARED" = "x0" ; then ! COND_WX_SHARED_0="" ! fi ! AC_SUBST(COND_WX_SHARED_0) ! dnl ### begin block 20_COND_WX_SHARED_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_WX_SHARED_1="#" ! if test "x$WX_SHARED" = "x1" ; then ! COND_WX_SHARED_1="" ! fi ! AC_SUBST(COND_WX_SHARED_1) --- 73,140 ---- fi AC_SUBST(COND_USE_BIN2C_1) ! dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_USE_SOSYMLINKS_1="#" ! if test "x$USE_SOSYMLINKS" = "x1" ; then ! COND_USE_SOSYMLINKS_1="" ! fi ! AC_SUBST(COND_USE_SOSYMLINKS_1) ! dnl ### begin block 20_COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#" ! if test "x$USE_SOVERCYGWIN" = "x1" -a "x$USE_SOVERSION" = "x1" ; then ! COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="" ! fi ! AC_SUBST(COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1) ! dnl ### begin block 20_COND_USE_SOVERLINUX_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_USE_SOVERLINUX_1="#" ! if test "x$USE_SOVERLINUX" = "x1" ; then ! COND_USE_SOVERLINUX_1="" ! fi ! AC_SUBST(COND_USE_SOVERLINUX_1) ! dnl ### begin block 20_COND_USE_SOVERSION_0[../../modules/build/bakefiles/modules.bkl] ### ! COND_USE_SOVERSION_0="#" ! if test "x$USE_SOVERSION" = "x0" ; then ! COND_USE_SOVERSION_0="" ! fi ! AC_SUBST(COND_USE_SOVERSION_0) ! dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_USE_SOVERSOLARIS_1="#" ! if test "x$USE_SOVERSOLARIS" = "x1" ; then ! COND_USE_SOVERSOLARIS_1="" ! fi ! AC_SUBST(COND_USE_SOVERSOLARIS_1) ! dnl ### begin block 20_COND_USE_UTIL_1[./wxlua.bkl] ### ! COND_USE_UTIL_1="#" ! if test "x$USE_UTIL" = "x1" ; then ! COND_USE_UTIL_1="" ! fi ! AC_SUBST(COND_USE_UTIL_1) ! dnl ### begin block 20_COND_USE_WXLUAAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAAPP_1="#" ! if test "x$USE_WXLUAAPP" = "x1" ; then ! COND_USE_WXLUAAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAAPP_1) ! dnl ### begin block 20_COND_USE_WXLUAEDITAPP_1[../../apps/build/bakefiles/apps.bkl] ### ! COND_USE_WXLUAEDITAPP_1="#" ! if test "x$USE_WXLUAEDITAPP" = "x1" ; then ! COND_USE_WXLUAEDITAPP_1="" ! fi ! AC_SUBST(COND_USE_WXLUAEDITAPP_1) ! dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_WINDOWS_IMPLIB_1="#" ! if test "x$WINDOWS_IMPLIB" = "x1" ; then ! COND_WINDOWS_IMPLIB_1="" ! fi ! AC_SUBST(COND_WINDOWS_IMPLIB_1) ! dnl ### begin block 20_COND_WX_SHARED_0[../../modules/build/bakefiles/modules.bkl] ### ! COND_WX_SHARED_0="#" ! if test "x$WX_SHARED" = "x0" ; then ! COND_WX_SHARED_0="" ! fi ! AC_SUBST(COND_WX_SHARED_0) ! dnl ### begin block 20_COND_WX_SHARED_1[../../modules/build/bakefiles/modules.bkl] ### ! COND_WX_SHARED_1="#" ! if test "x$WX_SHARED" = "x1" ; then ! COND_WX_SHARED_1="" ! fi ! AC_SUBST(COND_WX_SHARED_1) |
From: Klaas H. <ti...@us...> - 2006-02-03 17:06:28
|
Update of /cvsroot/wxlua/wxLua/util/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27363/util/build/msw Modified Files: util.dsp util.dsw Log Message: added wxluacan Index: util.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/util.dsw,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** util.dsw 25 Jan 2006 18:35:59 -0000 1.3 --- util.dsw 3 Feb 2006 17:06:16 -0000 1.4 *************** *** 1,16 **** ! Microsoft Developer Studio Workspace File, Format Version 6.00 ! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ! ! ############################################################################### ! Project: "util_bin2c"=util.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! --- 1,16 ---- ! Microsoft Developer Studio Workspace File, Format Version 6.00 ! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ! ! ############################################################################### ! Project: "util_bin2c"=util.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! }}} ! ! ############################################################################### ! Index: util.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/msw/util.dsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** util.dsp 29 Jan 2006 15:45:41 -0000 1.9 --- util.dsp 3 Feb 2006 17:06:16 -0000 1.10 *************** *** 1,243 **** ! # Microsoft Developer Studio Project File - Name="util" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=util_bin2c - Win32 Release ! !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") ! !MESSAGE "util_bin2c - Win32 DLL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 DLL Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 Unicode Release" (based on "Win32 (x86) Console Application") ! !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 ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "util_bin2c - Win32 DLL Unicode Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 DLL Unicode Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 DLL Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 DLL Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Unicode Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Unicode Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ENDIF ! ! # Begin Target ! ! # Name "util_bin2c - Win32 DLL Unicode Debug" ! # Name "util_bin2c - Win32 DLL Unicode Release" ! # Name "util_bin2c - Win32 DLL Debug" ! # Name "util_bin2c - Win32 DLL Release" ! # Name "util_bin2c - Win32 Unicode Debug" ! # Name "util_bin2c - Win32 Unicode Release" ! # Name "util_bin2c - Win32 Debug" ! # Name "util_bin2c - Win32 Release" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "" ! # Begin Source File ! ! SOURCE=.\bin2c\bin2c.c ! # End Source File ! # End Group ! # End Target ! # End Project ! --- 1,243 ---- ! # Microsoft Developer Studio Project File - Name="util" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=util_bin2c - Win32 Release ! !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") ! !MESSAGE "util_bin2c - Win32 DLL Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 DLL Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 Unicode Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE "util_bin2c - Win32 Unicode Release" (based on "Win32 (x86) Console Application") ! !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 ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "util_bin2c - Win32 DLL Unicode Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 DLL Unicode Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 DLL Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 DLL Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Unicode Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjud\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjud\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Unicode Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prju\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prju\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prjd\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prjd\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ELSEIF "$(CFG)" == "util_bin2c - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "..\..\..\bin" ! # PROP BASE Intermediate_Dir "msvc6prj\util_bin2c" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "..\..\..\bin" ! # PROP Intermediate_Dir "msvc6prj\util_bin2c" ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD CPP /nologo /FD /MD /W1 /GR /EHsc /D "WIN32" /D "_CONSOLE" /c ! # ADD BASE RSC /l 0x409 /d _CONSOLE ! # ADD RSC /l 0x409 /d _CONSOLE ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! LINK32=link.exe ! # ADD BASE LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! # ADD LINK32 /nologo /machine:i386 /out:"..\..\..\bin\bin2c.exe" /subsystem:console ! ! !ENDIF ! ! # Begin Target ! ! # Name "util_bin2c - Win32 DLL Unicode Debug" ! # Name "util_bin2c - Win32 DLL Unicode Release" ! # Name "util_bin2c - Win32 DLL Debug" ! # Name "util_bin2c - Win32 DLL Release" ! # Name "util_bin2c - Win32 Unicode Debug" ! # Name "util_bin2c - Win32 Unicode Release" ! # Name "util_bin2c - Win32 Debug" ! # Name "util_bin2c - Win32 Release" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "" ! # Begin Source File ! ! SOURCE=.\bin2c\bin2c.c ! # End Source File ! # End Group ! # End Target ! # End Project ! |
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27363/apps/wxluacan/src Added Files: Makefile cancom.cpp cancom.h canlua.cpp canlua.h cansim.cpp cansim.h cansim.rc genwxbind.bat override.hpp wxluacan.cpp wxluacan.h wxluacan.i wxluacan.rules wxluacan_builtin.cpp wxluacan_class.cpp wxluacan_define.cpp wxluacan_event.cpp wxluacan_object.cpp Log Message: added wxluacan --- NEW FILE: wxluacan.cpp --- // --------------------------------------------------------- // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file // is regenerated // --------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxluacan.h" // ------------------------------------------------------------------------------------------------- // Bind class wxlCanObj // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class int s_wxluatag_wxlCanObj = -1; // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxlCanObj_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObj *returns; // get number of arguments int argCount = lua_gettop(L); // double y = 0 double y = (argCount >= 2 ? (double)wxlState.getnumbertype(2) : 0); // double x = 0 double x = (argCount >= 1 ? (double)wxlState.getnumbertype(1) : 0); // call constructor returns = new wxlCanObj(x, y); // add to tracked memory list wxLua_addToTrackedMemoryList(wxlState, (wxlCanObj *)returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxlCanObj, returns); return 1; } // void SetPending( bool pending = true ) static int LUACALL wxlCanObj_SetPending(lua_State *L) { wxLuaState wxlState(L); // get number of arguments int argCount = lua_gettop(L); // bool pending = true bool pending = (argCount >= 2 ? wxlState.getbooleantype(2) : true); // get this wxlCanObj * self = (wxlCanObj *)wxlState.getuserdatatype(1, s_wxluatag_wxlCanObj); // call SetPending self->SetPending(pending); return 0; } static int LUACALL wxlCanObj_destructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObj * self = (wxlCanObj *)wxlState.getuserdatatype(1, s_wxluatag_wxlCanObj); // remove from tracked memory list if (self != 0) wxlState.removeTrackedMemory(self); return 0; } static int LUACALL wxlCanObj_Delete(lua_State *L) { wxLuaState wxlState(L); wxlCanObj * self = (wxlCanObj *)wxlState.getuserdatatype(1, s_wxluatag_wxlCanObj); // remove from tracked memory list if (self != 0) if (wxlState.removeTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); lua_setmetatable(L, -2); } return 0; } #if wxLUA_USE_wxDC // void Draw( wxDC& dc, double absx, double absy ) static int LUACALL wxlCanObj_Draw(lua_State *L) { wxLuaState wxlState(L); // double absy double absy = (double)wxlState.getnumbertype(4); // double absx double absx = (double)wxlState.getnumbertype(3); // wxDC dc wxDC * dc = (wxDC *)wxlState.getuserdatatype(2, s_wxluatag_wxDC); // get this wxlCanObj * self = (wxlCanObj *)wxlState.getuserdatatype(1, s_wxluatag_wxlCanObj); // call Draw self->Draw(*dc, absx, absy); return 0; } #endif // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxlCanObj_methods[] = { { LuaConstructor, "wxlCanObj", wxlCanObj_constructor, 2, 0 }, { LuaMethod, "SetPending", wxlCanObj_SetPending, 1, 0 }, { LuaDelete, "wxlCanObj", wxlCanObj_destructor, 0, 0 }, { LuaMethod, "Delete", wxlCanObj_Delete, 0, 0 }, #if wxLUA_USE_wxDC { LuaMethod, "Draw", wxlCanObj_Draw, 3, 3 }, #endif }; // Extern accessor to class method map WXLUAMETHOD* wxlCanObj_methods = s_wxlCanObj_methods; int wxlCanObj_methodCount = sizeof(s_wxlCanObj_methods)/sizeof(s_wxlCanObj_methods[0]); // ------------------------------------------------------------------------------------------------- // Bind class wxlCanObjRect // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class int s_wxluatag_wxlCanObjRect = -1; // wxlCanObjRect( double x, double y, double w, double h ) static int LUACALL wxlCanObjRect_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObjRect *returns; // double h double h = (double)wxlState.getnumbertype(4); // double w double w = (double)wxlState.getnumbertype(3); // double y double y = (double)wxlState.getnumbertype(2); // double x double x = (double)wxlState.getnumbertype(1); // call constructor returns = new wxlCanObjRect(x, y, w, h); // add to tracked memory list wxLua_addToTrackedMemoryList(wxlState, (wxlCanObjRect *)returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxlCanObjRect, returns); return 1; } static int LUACALL wxlCanObjRect_destructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObjRect * self = (wxlCanObjRect *)wxlState.getuserdatatype(1, s_wxluatag_wxlCanObjRect); // remove from tracked memory list if (self != 0) wxlState.removeTrackedMemory(self); return 0; } static int LUACALL wxlCanObjRect_Delete(lua_State *L) { wxLuaState wxlState(L); wxlCanObjRect * self = (wxlCanObjRect *)wxlState.getuserdatatype(1, s_wxluatag_wxlCanObjRect); // remove from tracked memory list if (self != 0) if (wxlState.removeTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); lua_setmetatable(L, -2); } return 0; } // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxlCanObjRect_methods[] = { { LuaConstructor, "wxlCanObjRect", wxlCanObjRect_constructor, 4, 4 }, { LuaDelete, "wxlCanObjRect", wxlCanObjRect_destructor, 0, 0 }, { LuaMethod, "Delete", wxlCanObjRect_Delete, 0, 0 }, }; // Extern accessor to class method map WXLUAMETHOD* wxlCanObjRect_methods = s_wxlCanObjRect_methods; int wxlCanObjRect_methodCount = sizeof(s_wxlCanObjRect_methods)/sizeof(s_wxlCanObjRect_methods[0]); // ------------------------------------------------------------------------------------------------- // Bind class wxlCan // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class int s_wxluatag_wxlCan = -1; // void AddObject( wxlCanObj *canobj ) static int LUACALL wxlCan_AddObject(lua_State *L) { wxLuaState wxlState(L); // wxlCanObj canobj wxlCanObj * canobj = (wxlCanObj *)wxlState.getuserdatatype(2, s_wxluatag_wxlCanObj); // get this wxlCan * self = (wxlCan *)wxlState.getuserdatatype(1, s_wxluatag_wxlCan); // call AddObject self->AddObject(canobj); return 0; } // bool GetYaxis() static int LUACALL wxlCan_GetYaxis(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxlCan * self = (wxlCan *)wxlState.getuserdatatype(1, s_wxluatag_wxlCan); // call GetYaxis returns = self->GetYaxis(); // push the result flag lua_pushboolean(L, returns); return 1; } // wxlLuaCanCmd* GetCmdh() static int LUACALL wxlCan_GetCmdh(lua_State *L) { wxLuaState wxlState(L); wxlLuaCanCmd *returns; // get this wxlCan * self = (wxlCan *)wxlState.getuserdatatype(1, s_wxluatag_wxlCan); // call GetCmdh returns = self->GetCmdh(); // push the result datatype wxlState.pushuserdatatype(s_wxluatag_wxlLuaCanCmd, returns); return 1; } static int LUACALL wxlCan_destructor(lua_State *L) { wxLuaState wxlState(L); wxlCan * self = (wxlCan *)wxlState.getuserdatatype(1, s_wxluatag_wxlCan); // remove from tracked memory list if (self != 0) wxlState.removeTrackedMemory(self); return 0; } static int LUACALL wxlCan_Delete(lua_State *L) { wxLuaState wxlState(L); wxlCan * self = (wxlCan *)wxlState.getuserdatatype(1, s_wxluatag_wxlCan); // remove from tracked memory list if (self != 0) if (wxlState.removeTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); lua_setmetatable(L, -2); } return 0; } #if wxLUA_USE_wxPointSizeRect // wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) static int LUACALL wxlCan_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCan *returns; // get number of arguments int argCount = lua_gettop(L); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.getuserdatatype(4, s_wxluatag_wxSize) : &wxDefaultSize); // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxlState.getuserdatatype(3, s_wxluatag_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlState.getnumbertype(2) : -1); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.getuserdatatype(1, s_wxluatag_wxWindow); // call constructor returns = new wxlCan(parent, id, *pos, *size); // add to tracked memory list wxLua_addToTrackedMemoryList(wxlState, (wxlCan *)returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxlCan, returns); return 1; } #endif // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxlCan_methods[] = { { LuaMethod, "AddObject", wxlCan_AddObject, 1, 1 }, { LuaMethod, "GetYaxis", wxlCan_GetYaxis, 0, 0 }, { LuaMethod, "GetCmdh", wxlCan_GetCmdh, 0, 0 }, { LuaDelete, "wxlCan", wxlCan_destructor, 0, 0 }, { LuaMethod, "Delete", wxlCan_Delete, 0, 0 }, #if wxLUA_USE_wxPointSizeRect { LuaConstructor, "wxlCan", wxlCan_constructor, 4, 1 }, #endif }; // Extern accessor to class method map WXLUAMETHOD* wxlCan_methods = s_wxlCan_methods; int wxlCan_methodCount = sizeof(s_wxlCan_methods)/sizeof(s_wxlCan_methods[0]); // ------------------------------------------------------------------------------------------------- // Bind class wxlLuaCanCmd // ------------------------------------------------------------------------------------------------- // Lua MetaTable Tag for Class int s_wxluatag_wxlLuaCanCmd = -1; // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxlLuaCanCmd_constructor(lua_State *L) { wxLuaState wxlState(L); wxlLuaCanCmd *returns; // get number of arguments int argCount = lua_gettop(L); // int maxCommands = -1 int maxCommands = (argCount >= 2 ? (int)wxlState.getnumbertype(2) : -1); // wxlCan canvas wxlCan * canvas = (wxlCan *)wxlState.getuserdatatype(1, s_wxluatag_wxlCan); // call constructor returns = new wxlLuaCanCmd(canvas, maxCommands); // add to tracked memory list wxLua_addToTrackedMemoryList(wxlState, (wxlLuaCanCmd *)returns); // push the constructed class pointer wxlState.pushuserdatatype(s_wxluatag_wxlLuaCanCmd, returns); return 1; } // void MoveObject( int index, double x, double y ); static int LUACALL wxlLuaCanCmd_MoveObject(lua_State *L) { wxLuaState wxlState(L); // double y double y = (double)wxlState.getnumbertype(4); // double x double x = (double)wxlState.getnumbertype(3); // int index int index = (int)wxlState.getnumbertype(2); // get this wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxlState.getuserdatatype(1, s_wxluatag_wxlLuaCanCmd); // call MoveObject self->MoveObject(index, x, y); return 0; } static int LUACALL wxlLuaCanCmd_destructor(lua_State *L) { wxLuaState wxlState(L); wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxlState.getuserdatatype(1, s_wxluatag_wxlLuaCanCmd); // remove from tracked memory list if (self != 0) wxlState.removeTrackedMemory(self); return 0; } static int LUACALL wxlLuaCanCmd_Delete(lua_State *L) { wxLuaState wxlState(L); wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxlState.getuserdatatype(1, s_wxluatag_wxlLuaCanCmd); // remove from tracked memory list if (self != 0) if (wxlState.removeTrackedMemory(self)) { // if removed, reset the tag so that gc() is not called on this object. lua_pushnil(L); lua_setmetatable(L, -2); } return 0; } // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxlLuaCanCmd_methods[] = { { LuaConstructor, "wxlLuaCanCmd", wxlLuaCanCmd_constructor, 2, 1 }, { LuaMethod, "MoveObject", wxlLuaCanCmd_MoveObject, 3, 3 }, { LuaDelete, "wxlLuaCanCmd", wxlLuaCanCmd_destructor, 0, 0 }, { LuaMethod, "Delete", wxlLuaCanCmd_Delete, 0, 0 }, }; // Extern accessor to class method map WXLUAMETHOD* wxlLuaCanCmd_methods = s_wxlLuaCanCmd_methods; int wxlLuaCanCmd_methodCount = sizeof(s_wxlLuaCanCmd_methods)/sizeof(s_wxlLuaCanCmd_methods[0]); --- NEW FILE: genwxbind.bat --- @echo off REM @echo on SET WXLUA=..\..\.. echo Generating wxWidgets Binding %WXLUA%\bin\lua.exe -e"rulesFilename=\"wxluacan.rules\"" %WXLUA%\bindings\genwxbind.lua echo Done wxluacan wraps --- NEW FILE: canlua.h --- /*! \file canlua.h \brief simple canvas which takes as drawable area the whole of the scrollable area. \author Klaas Holwerda Copyright: 2001-2004 (C) Klaas Holwerda Licence: wxWidgets Licence RCS-ID: $Id: canlua.h,v 1.1 2006/02/03 17:06:15 titato Exp $ */ #ifndef __LUACAN_H__ #define __LUACAN_H__ #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wx/wx.h" class wxlCanObj; class wxlLuaCanCmd; WX_DECLARE_LIST( wxlCanObj, wxlCanObjList); class wxlCan; class wxlCanObj: public wxObject { public: wxlCanObj( double x = 0, double y = 0 ); ~wxlCanObj(); void SetPos( double x, double y ) { m_x = x; m_y = y; SetPending( true ); } double GetX() { return m_x; } double GetY() { return m_y; } void SetPen( const wxPen& pen ) { m_pen = pen; } void SetBrush( const wxBrush& brush ) { m_brush = brush; } void Draw( wxDC& dc, double absx, double absy ); wxlCanObj* WhichIsHit( double x, double y ); bool IsHit( double x, double y, double absx = 0, double absy = 0); void SetCanvas( wxlCan* canvas ) { m_canvas = canvas; } void AddObject( wxlCanObj *canobj ); wxlCanObj* GetItem( size_t index ); void SetPending( bool pending = true ); wxlCanObjList m_objects; protected: virtual void DoDraw( wxDC& dc, double absx, double absy ) {} virtual bool DoIsHit( double x, double y, double absx, double absy ) { return false; } wxBrush m_brush; wxPen m_pen; wxlCan* m_canvas; double m_x, m_y; }; class wxlCanObjRect: public wxlCanObj { public: wxlCanObjRect( double x, double y, double w, double h ); void DoDraw( wxDC& dc, double absx, double absy ); bool DoIsHit( double x, double y, double absx, double absy ); protected: double m_w, m_h; }; class wxlCanObjCircle: public wxlCanObj { public: wxlCanObjCircle( double x, double y, double r ); void DoDraw( wxDC& dc, double absx, double absy ); bool DoIsHit( double x, double y, double absx, double absy ); protected: double m_r; }; class wxlCanObjScript: public wxlCanObj { public: wxlCanObjScript( double x, double y, const wxString& script ); void DoDraw( wxDC& dc, double absx, double absy ); bool DoIsHit( double x, double y, double absx, double absy ); protected: wxString m_script; }; //! Simple canvas using a whole view for all of the scrolled window /*! */ class wxlCan: public wxScrolledWindow { public: //!constructor /*! construct a canvas window. \param parent parent window (use wxNO_FULL_REPAINT_ON_RESIZE on parent wxFrame) \param id window id \param pos position of window \param size size of window \param style type of window (wxHSCROLL|wxVSCROLL) \remark with new unknown drawer types you can derive or extend the library */ wxlCan( wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxScrolledWindowStyle ); //!destructor /*! */ virtual ~wxlCan(); //!get y axis orientation inline bool GetYaxis() const { return m_yaxis; } //!set if the Yaxis goes up or down virtual void SetYaxis(bool up); void SetBackgroundBrush( const wxBrush& brush ); void SetPending( bool pending = true ); void Render( wxDC& dc ); //! Give the virtual size to be displayed. /*! To display all of a drawing, set this here to the boundingbox of the root object of the canvas. So vx1 and vx2 to the miminum x and y of the boundingbox. Calculate xpp and ypp in such a manner that it will show the whole drawing. \param vx1: minimum x coordinate of display area \param vy1: minimum y coordinate of display area \param xpp: Number of user units per pixel in x \param ypp: Number of user units per pixel in y */ void SetMappingUpp( double vx1, double vy1, double xpp, double ypp ); //! convert x from device to virtual coordinates inline double DeviceToWorldX( double x) const { return (x - m_transx)/m_scalex; } //! convert y from device to virtual coordinates inline double DeviceToWorldY( double y) const { return (y - m_transy)/m_scaley; } //! convert x relative from device to virtual coordinates /*! Use this to convert a length of a line for instance */ inline double DeviceToWorldXRel( double x) const { return x/m_scalex; } //! convert y relative from device to virtual coordinates /*! Use this to convert a length of a line for instance */ inline double DeviceToWorldYRel( double y) const { return y/m_scaley; } /*! Use this to convert a length of a line for instance */ inline int WorldToDeviceXRel(double x) const {return (int) floor(m_scalex * x + 0.5); } //! convert y relative from virtual to device coordinates /*! Use this to convert a length of a line for instance */ inline int WorldToDeviceYRel(double y) const {return (int) floor(m_scaley * y + 0.5); } //! convert x from virtual to device coordinates inline int WorldToDeviceX(double x) const { return (int) floor(m_scalex * x + m_transx + 0.5); } //! convert y from virtual to device coordinates inline int WorldToDeviceY(double y) const { return (int) floor(m_scaley * y + m_transy + 0.5); } void AddObject( wxlCanObj *canobj ); wxlLuaCanCmd* GetCmdh() { return m_cmdh; } wxlCanObj& GetRootObject() { return m_rootobject; } protected: void OnMouseEvent(wxMouseEvent& event); //! redraw pending objects to the buffer void OnIdle(wxIdleEvent &event); //! resize, adjusting buffer of a2dCanvasView if needed. void OnSize( wxSizeEvent &event ); //! repaint damaged araes, taking into acount non updated araes in a2dCanvasView. void OnPaint( wxPaintEvent &event ); void OnScroll(wxScrollWinEvent& event); void OnEraseBackground(wxEraseEvent& WXUNUSED(event) ); private: wxlLuaCanCmd* m_cmdh; wxBitmap m_buffer; bool m_pendingObjects; //! virtual coordinates box its miminum X double m_virt_minX; //! virtual coordinates box its miminum Y double m_virt_minY; //!user units per pixel in x double m_xpp; //!user units per pixel in y double m_ypp; //!transformation from world to device coordinates double m_scalex; //!transformation from world to device coordinates double m_scaley; //!transformation from world to device coordinates double m_transx; //!transformation from world to device coordinates double m_transy; //! up or down bool m_yaxis; wxBrush m_backbrush; wxlCanObj m_rootobject; wxlCanObj* m_hit; double m_startMouseX, m_startMouseY; double m_startObjX, m_startObjY; DECLARE_CLASS(wxlCan) DECLARE_EVENT_TABLE() }; #endif // A2DCANVAS --- NEW FILE: canlua.cpp --- /*! \file canlua.cpp \author Klaas Holwerda Copyright: 2001-2004 (C) Klaas Holwerda Licence: wxWidgets Licence RCS-ID: $Id: canlua.cpp,v 1.1 2006/02/03 17:06:15 titato Exp $ */ #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "canlua.h" #include "cancom.h" #include <wx/listimpl.cpp> WX_DEFINE_LIST(wxlCanObjList); wxlCanObj::wxlCanObj( double x, double y ) { m_x = x; m_y = y; m_brush = *wxRED_BRUSH; m_pen = *wxGREEN_PEN; m_canvas = NULL; } wxlCanObj::~wxlCanObj() { m_objects.DeleteContents( true ); m_objects.Clear(); } void wxlCanObj::AddObject( wxlCanObj *canobj ) { canobj->SetCanvas( m_canvas ); m_objects.Append( canobj ); SetPending( true ); } wxlCanObj* wxlCanObj::GetItem( size_t index ) { return m_objects.Item( index )->GetData(); } void wxlCanObj::SetPending( bool pending ) { m_canvas->SetPending( pending ); } void wxlCanObj::Draw( wxDC& dc, double absx, double absy ) { dc.SetPen( m_pen ); dc.SetBrush( m_brush ); absx += m_x; absy += m_y; DoDraw( dc, absx, absy ); // iterate over the child list for ( wxlCanObjList::Node *node = m_objects.GetFirst(); node; node = node->GetNext() ) { wxlCanObj *drawobj = node->GetData(); drawobj->Draw( dc , absx, absy ); } } wxlCanObj* wxlCanObj::WhichIsHit( double x, double y ) { // iterate over the child list for ( wxlCanObjList::Node *node = m_objects.GetLast(); node; node = node->GetPrevious() ) { wxlCanObj *drawobj = node->GetData(); if ( drawobj->IsHit( x, y ) ) return drawobj; } return NULL; } bool wxlCanObj::IsHit( double x, double y, double absx, double absy ) { absx += m_x; absy += m_y; if ( DoIsHit( x, y, absx, absy ) ) return true; // iterate over the child list for ( wxlCanObjList::Node *node = m_objects.GetFirst(); node; node = node->GetNext() ) { wxlCanObj *drawobj = node->GetData(); if ( drawobj->IsHit( x, y, absx, absy ) ) return true; } return false; } wxlCanObjRect::wxlCanObjRect( double x, double y, double w, double h ) :wxlCanObj( x, y ) { m_w = w; m_h = h; } void wxlCanObjRect::DoDraw( wxDC& dc, double absx, double absy ) { dc.DrawRectangle( m_canvas->WorldToDeviceX( absx ), m_canvas->WorldToDeviceX( absy ), m_canvas->WorldToDeviceXRel( m_w ), m_canvas->WorldToDeviceYRel( m_h ) ); } bool wxlCanObjRect::DoIsHit( double x, double y, double absx, double absy ) { double xh,yh; xh = x - absx; yh = y - absy; double xmin = wxMin( 0 , m_w); double ymin = wxMin( 0 , m_h); double xmax = wxMax( 0 , m_w); double ymax = wxMax( 0 , m_h); // check if inside bounding box with positive margin if ( xh < xmax && yh < ymax && xh > xmin && yh > ymin ) { return true; } return false; } wxlCanObjCircle::wxlCanObjCircle( double x, double y, double r ) :wxlCanObj( x, y ) { m_r = r; } void wxlCanObjCircle::DoDraw( wxDC& dc, double absx, double absy ) { dc.DrawCircle( m_canvas->WorldToDeviceX( absx ), m_canvas->WorldToDeviceX( absy ), m_canvas->WorldToDeviceXRel( m_r ) ); } bool wxlCanObjCircle::DoIsHit( double x, double y, double absx, double absy ) { double xh,yh; xh = x - absx; yh = y - absy; double r = sqrt((xh*xh)+(yh*yh)); if ( m_r > r) { return true; } return false; } wxlCanObjScript::wxlCanObjScript( double x, double y, const wxString& script ) :wxlCanObj( x, y ) { m_script = script; } void wxlCanObjScript::DoDraw( wxDC& dc, double absx, double absy ) { // run all statements in the script which should be drawing statements on a wxDC dc.DrawCircle( m_canvas->WorldToDeviceX( absx ), m_canvas->WorldToDeviceX( absy ), m_canvas->WorldToDeviceXRel( 20 ) ); } bool wxlCanObjScript::DoIsHit( double x, double y, double absx, double absy ) { return false; } IMPLEMENT_CLASS( wxlCan, wxScrolledWindow) BEGIN_EVENT_TABLE( wxlCan, wxScrolledWindow) EVT_IDLE( wxlCan::OnIdle ) EVT_PAINT( wxlCan::OnPaint ) EVT_SIZE( wxlCan::OnSize ) EVT_SCROLLWIN( wxlCan::OnScroll ) EVT_ERASE_BACKGROUND( wxlCan::OnEraseBackground ) EVT_MOUSE_EVENTS( wxlCan::OnMouseEvent ) END_EVENT_TABLE() wxlCan::wxlCan( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ): wxScrolledWindow( parent, id, pos, size, style ) { int w,h; GetVirtualSize( &w, &h ); m_buffer = wxBitmap( size.GetWidth(), size.GetHeight() ); m_pendingObjects = false; //set one to one mapping as default m_xpp = 1; m_ypp = 1; m_virt_minX = 0; m_virt_minY = 0; m_transx = 0; m_transy = 0; m_scalex = 1; m_scaley = 1; m_rootobject.SetCanvas( this ); m_hit = NULL; m_cmdh = new wxlLuaCanCmd( this ); } wxlCan::~wxlCan() { delete m_cmdh; } void wxlCan::OnEraseBackground(wxEraseEvent& event ) { //event.Skip(); } void wxlCan::SetBackgroundBrush( const wxBrush& brush ) { m_backbrush = brush; m_pendingObjects = true; } void wxlCan::SetYaxis(bool up) { m_yaxis = up; SetMappingUpp( m_virt_minX, m_virt_minY, m_xpp, m_ypp ); } // maps the virtual window (Real drawing to the window coordinates // also used for zooming void wxlCan::SetMappingUpp( double vx1, double vy1, double xpp, double ypp ) { double wx = m_buffer.GetWidth(); double wy = m_buffer.GetHeight(); m_xpp = xpp; m_ypp = ypp; m_virt_minX = vx1; m_virt_minY = vy1; // initialize the mapping used for mapping the // virtual window to the pixel window // translate the drawing to 0,0 if (m_yaxis) { double virt_maxY = m_virt_minY + wy*m_ypp; m_transx = -m_virt_minX; m_transy = -virt_maxY ; } else { m_transx = -m_virt_minX; m_transy = -m_virt_minY; } // scale the drawing so that one pixel is the right number of units m_scalex = 1/m_xpp; m_scaley = 1/m_ypp; m_transx = m_transx*m_scalex; m_transy = m_transy*m_scaley; // because of coordinate change mirror over X // 0,0 in graphic computerscreens: upperleft corner // 0,0 in cartesian: lowerleft corner if (m_yaxis) { m_scaley = -m_scaley; m_transy = -m_transy; } m_pendingObjects = true; Refresh(); } void wxlCan::OnMouseEvent(wxMouseEvent& event) { wxPoint pos = event.GetPosition(); int xx, yy; CalcUnscrolledPosition( pos.x, pos.y, &xx, &yy ); double mouse_worldx = DeviceToWorldX( xx ); double mouse_worldy = DeviceToWorldY( yy ); wxString str; str.Printf( _T("%6.3f,%6.3f"), mouse_worldx, mouse_worldy ); ((wxFrame*)m_parent)->SetStatusText( str ); if ( event.Moving() && !m_hit ) { wxlCanObj* hit = m_rootobject.WhichIsHit( mouse_worldx, mouse_worldy ); if ( hit ) SetCursor( wxCURSOR_HAND ); else SetCursor( wxCURSOR_ARROW ); } if ( event.LeftDown() ) { m_hit = m_rootobject.WhichIsHit( mouse_worldx, mouse_worldy ); if ( m_hit ) { CaptureMouse(); m_startMouseX = mouse_worldx; m_startMouseY = mouse_worldy; m_startObjX = m_hit->GetX(); m_startObjY = m_hit->GetY(); } } else if ( event.Dragging() && m_hit ) { m_hit->SetPos( m_startObjX + mouse_worldx - m_startMouseX, m_startObjY + mouse_worldy - m_startMouseY ); } else if (event.LeftUp() && m_hit ) { m_hit->SetPos( m_startObjX, m_startObjY); m_cmdh->Submit( new wxlMoveObjectCmd( m_hit, m_startObjX + mouse_worldx - m_startMouseX, m_startObjY + mouse_worldy - m_startMouseY ) ); ReleaseMouse(); m_hit = NULL; } } void wxlCan::OnIdle(wxIdleEvent &event) { if ( m_pendingObjects ) { wxMemoryDC mdc; mdc.SelectObject( m_buffer ); //draw object into buffer Render( mdc ); mdc.SelectObject( wxNullBitmap ); Refresh(); m_pendingObjects = false; } event.Skip(); //always skip idle events } void wxlCan::AddObject( wxlCanObj *canobj ) { canobj->SetCanvas( this ); m_rootobject.AddObject( canobj ); } void wxlCan::SetPending( bool pending ) { m_pendingObjects = pending; } void wxlCan::Render( wxDC& dc ) { int w,h; GetVirtualSize( &w, &h ); dc.SetBackground( GetBackgroundColour() ); dc.Clear(); dc.SetBrush(m_backbrush); dc.SetPen( *wxTRANSPARENT_PEN ); dc.DrawRectangle( 0, 0, w, h ); //draw objects m_rootobject.Draw( dc, 0, 0 ); } void wxlCan::OnPaint(wxPaintEvent& WXUNUSED(event) ) { wxPaintDC dc(this); wxRegionIterator it( GetUpdateRegion() ); while (it) { int x = it.GetX(); int y = it.GetY(); int w = it.GetWidth(); int h = it.GetHeight(); int xx; int yy; CalcUnscrolledPosition( x, y, &xx, &yy); wxMemoryDC mdc; mdc.SelectObject( m_buffer ); dc.Blit( x, y, w, h, &mdc, xx, yy, wxCOPY, false ); mdc.SelectObject( wxNullBitmap ); it++; } } void wxlCan::OnScroll(wxScrollWinEvent& event) { int dx,dy; GetClientSize(&dx,&dy); wxScrolledWindow::OnScroll( event ); m_pendingObjects = true; } void wxlCan::OnSize(wxSizeEvent& event ) { int dx,dy; GetClientSize(&dx,&dy); int w,h; GetVirtualSize( &w, &h ); if ( w < dx ) w = dx; if ( h < dy ) h = dy; m_buffer = wxBitmap( w, h ); m_pendingObjects = true; } --- NEW FILE: wxluacan.i --- %include "canlua.h" %include "cancom.h" %include "cansim.h" %include <wx/module.h> %include "wxlua/include/internal.h" %include "wxbind/include/wxbind.h" %include "wx/gdicmn.h" %class %delete %noclassinfo wxlCanObj, wxObject wxlCanObj( double x = 0, double y = 0 ) void SetPending( bool pending = true ) void Draw( wxDC& dc, double absx, double absy ) %endclass %class %delete %noclassinfo wxlCanObjRect, wxlCanObj wxlCanObjRect( double x, double y, double w, double h ) %endclass %class %delete %noclassinfo wxlCan, wxScrolledWindow wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) void AddObject( wxlCanObj *canobj ) bool GetYaxis() wxlLuaCanCmd* GetCmdh() %endclass %builtin wxlCan* GetCan() %builtin wxlLuaCanCmd* GetCmdhMain() %class %delete %noclassinfo wxlLuaCanCmd, wxCommandProcessor wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) void MoveObject( int index, double x, double y ); %endclass --- NEW FILE: wxluacan_event.cpp --- // --------------------------------------------------------- // wxLuaGetEventList_wxluacan() is called by registerGeneratedClasses() // to register events // // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file // is regenerated // --------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxluacan.h" WXLUAEVENT* wxLuaGetEventList_wxluacan(size_t &count) { static WXLUAEVENT eventList[] = { { 0, 0, 0 }, }; count = (sizeof(eventList)/sizeof(eventList[0])) - 1; return eventList; } --- NEW FILE: cansim.cpp --- /*! \file cansim.cpp \author XX Copyright: 2001-2004 (C) XX Licence: wxWidgets Licence RCS-ID: $Id: cansim.cpp,v 1.1 2006/02/03 17:06:15 titato Exp $ */ #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif // Include private headers #include "cansim.h" // Include icon header #if defined(__WXGTK__) || defined(__WXMOTIF__) #include "mondrian.xpm" #endif // WDR: class implementations //------------------------------------------------------------------------------ // MyFrame //------------------------------------------------------------------------------ IMPLEMENT_APP(MyApp) wxlCan* mainCan; wxlCan* GetCan() { return mainCan; } wxlLuaCanCmd* GetCmdhMain() { return mainCan->GetCmdh(); } // WDR: event table for MyFrame BEGIN_EVENT_TABLE(MyFrame,wxFrame) EVT_MENU(ID_QUIT, MyFrame::OnQuit) EVT_CLOSE(MyFrame::OnCloseWindow) EVT_TIMER(-1, MyFrame::OnTimer) EVT_MENU_RANGE(MenuOption_First, MenuOption_Last, MyFrame::OnOption) EVT_MENU( lua_script, MyFrame::OnRunScript) EVT_MENU( wxID_UNDO, MyFrame::OnUndo) EVT_MENU( wxID_REDO, MyFrame::OnRedo) END_EVENT_TABLE() MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style ) : wxFrame( parent, id, title, position, size, style ) { m_xScale = 1.0; m_yScale = 1.0; m_xOrigin = 0; m_yOrigin = 0; m_yAxisReversed = true; CreateMyMenuBar(); CreateStatusBar(1); SetStatusText( _T("Welcome to a2dCanvas sample!") ); SetIcon(wxICON(mondrian)); //default 1000,1000 mapping mainCan = m_canvas = new wxlCan( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) ); m_interp = wxLuaState(NULL, wxID_ANY); m_interp.SetEventHandler( &wxGetApp() ); m_canvas->GetCmdh()->SetEditMenu( m_menuObjects ); //! set virtual size in pixels, this independent of the mapping below m_canvas->SetVirtualSize( 1000, 1000 ); m_canvas->SetScrollRate( 50, 50 ); m_canvas->SetBackgroundColour( wxColour( 223,234,251)); m_canvas->SetBackgroundBrush( wxBrush( wxColour( 30,174,171), wxCROSS_HATCH ) ); m_canvas->SetYaxis( false ); //true ); //defines the minimum x and y to show and the number of world units per pixel in x and y m_canvas->SetMappingUpp( m_xOrigin, m_yOrigin, m_xScale, m_yScale ); wxlCanObjRect* rect = new wxlCanObjRect( 170, 170,200, -120 ); rect->SetPen(*wxGREEN_PEN); rect->SetBrush( wxBrush( wxColour( 70, 124,71) ) ); m_canvas->AddObject( rect ); wxlCanObjCircle* circs = new wxlCanObjCircle( 0, 0, 20 ); circs->SetPen(*wxBLACK_PEN); circs->SetBrush( wxBrush( wxColour( 30,174,71) ) ); rect->AddObject( circs ); wxlCanObjCircle* circ = new wxlCanObjCircle( 140, 160,100 ); circ->SetPen(*wxRED_PEN); circ->SetBrush( wxBrush( wxColour( 30,74,71), wxFDIAGONAL_HATCH ) ); m_canvas->AddObject( circ ); m_timer = new wxTimer( this ); m_timer->Start( 80, false ); } MyFrame::~MyFrame() { delete m_timer; } void MyFrame::CreateMyMenuBar() { wxMenu *file_menu = new wxMenu; file_menu->Append( ID_QUIT, _T("Quit..."), _T("Quit program") ); wxMenu *menuMap = new wxMenu; menuMap->Append( Scale_StretchHoriz, _T("Stretch &horizontally\tCtrl-H") ); menuMap->Append( Scale_ShrinkHoriz, _T("Shrin&k horizontally\tCtrl-G") ); menuMap->Append( Scale_StretchVertic, _T("Stretch &vertically\tCtrl-V") ); menuMap->Append( Scale_ShrinkVertic, _T("&Shrink vertically\tCtrl-W") ); menuMap->AppendSeparator(); menuMap->Append( Map_Restore, _T("&Restore to normal\tCtrl-0") ); wxMenu *menuAxis = new wxMenu; menuAxis->Append( Axis_Vertic, _T("Mirror vertically\tCtrl-N"), _T(""), true ); wxMenu *menuLogical = new wxMenu; menuLogical->Append( Origin_MoveDown, _T("Move &down\tCtrl-D") ); menuLogical->Append( Origin_MoveUp, _T("Move &up\tCtrl-U") ); menuLogical->Append( Origin_MoveLeft, _T("Move &right\tCtrl-L") ); menuLogical->Append( Origin_MoveRight, _T("Move &left\tCtrl-R") ); menuLogical->AppendSeparator(); m_menuObjects = new wxMenu; m_menuObjects->Append( Object_AddRect, _T("Add rectangle") ); m_menuObjects->Append( Object_AddCircle, _T("Add circle") ); m_menuObjects->Append( lua_script, _T("Run Script") ); m_menuObjects->AppendSeparator(); m_menuObjects->Append(wxID_UNDO, _T("&Undo")); m_menuObjects->Append(wxID_REDO, _T("&Redo")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar(); menuBar->Append( file_menu, _T("File") ); menuBar->Append(menuMap, _T("&Mapping")); menuBar->Append(menuAxis, _T("&Axis")); menuBar->Append(menuLogical, _T("&Origin")); menuBar->Append(m_menuObjects, _T("&ModifyObjects")); SetMenuBar( menuBar ); } void MyFrame::OnUndo(wxCommandEvent& event) { m_canvas->GetCmdh()->Undo(); } void MyFrame::OnRedo(wxCommandEvent& event) { m_canvas->GetCmdh()->Redo(); } void MyFrame::OnQuit( wxCommandEvent &event ) { Close( true ); } void MyFrame::OnCloseWindow( wxCloseEvent &event ) { Destroy(); } void MyFrame::OnTimer( wxTimerEvent &event ) { wxWakeUpIdle(); } void MyFrame::OnOption(wxCommandEvent& event) { switch (event.GetId()) { case Origin_MoveDown: m_yOrigin += 10; break; case Origin_MoveUp: m_yOrigin -= 10; break; case Origin_MoveLeft: m_xOrigin += 10; break; case Origin_MoveRight: m_xOrigin -= 10; break; case Scale_StretchHoriz: m_xScale *= 1.10; break; case Scale_ShrinkHoriz: m_xScale /= 1.10; break; case Scale_StretchVertic: m_yScale *= 1.10; break; case Scale_ShrinkVertic: m_yScale /= 1.10; break; case Map_Restore: m_xScale = m_yScale = 1.0; m_xOrigin = m_yOrigin = 0; break; case Axis_Vertic: m_yAxisReversed = !m_yAxisReversed; m_canvas->SetYaxis(m_yAxisReversed); break; case Object_AddRect: { wxlCanObjRect* rect = new wxlCanObjRect( 170, 170,100, 50 ); rect->SetPen(*wxGREEN_PEN); rect->SetBrush( wxBrush( wxColour( 70, 124,171) ) ); m_canvas->AddObject( rect ); m_canvas->GetCmdh()->MoveObject( -1, 100,100 ); break; } case Object_AddCircle: { wxlCanObjCircle* circ = new wxlCanObjCircle( 140, 160,50 ); circ->SetPen(*wxGREEN_PEN); circ->SetBrush( wxBrush( wxColour(130,74,71), wxCROSSDIAG_HATCH ) ); m_canvas->AddObject( circ ); m_canvas->GetCmdh()->MoveObject( -1, 100,100 ); break; } default: // skip Refresh() return; } m_canvas->SetMappingUpp( m_xOrigin, m_yOrigin, m_xScale, m_yScale ); m_canvas->Refresh(); } void MyFrame::OnRunScript(wxCommandEvent& event) { wxString fullPath = wxFileSelector( _("Select a script file"), _(""), _(""), _("lua"), _("*.lua") , 0, this ); if ( !fullPath.IsEmpty() && ::wxFileExists( fullPath ) ) { if ( 0 != m_interp.RunFile( fullPath ) ) { wxLogWarning( _("Error in Lua Script") ); } } } //------------------------------------------------------------------------------ // MyApp //------------------------------------------------------------------------------ BEGIN_EVENT_TABLE(MyApp, wxApp) EVT_LUA_CONSOLE (wxID_ANY, MyApp::OnLua) EVT_LUA_WARNING (wxID_ANY, MyApp::OnLua) EVT_LUA_ERROR (wxID_ANY, MyApp::OnLua) EVT_LUA_DEBUG_HOOK (wxID_ANY, MyApp::OnLua) EVT_LUA_SHUTDOWN (wxID_ANY, MyApp::OnLua) END_EVENT_TABLE() MyApp::MyApp() { } bool MyApp::OnInit() { m_frame = new MyFrame( NULL, -1, _T("LuaCan"), wxPoint(20,30), wxSize(600,440) ); m_frame->Show( true ); return true; } int MyApp::OnExit() { return 0; } void MyApp::OnLua( wxLuaEvent &event ) { if (event.GetEventType() == wxEVT_LUA_CONSOLE) { wxMessageBox(event.GetString(), wxT("maskpro")); } else if (event.GetEventType() == wxEVT_LUA_ERROR) { wxMessageBox(event.GetString(), wxT("maskpro")); } } --- NEW FILE: override.hpp --- %override wxPoint_GetX // int GetX() static int LUACALL wxPoint_GetX(lua_State *L) { wxLuaState wxlState(L); // get this wxPoint *self = (wxPoint *)wxlState.getuserdatatype(1, s_wxluatag_wxPoint); // push the result number lua_pushnumber(L, self->x); // return the number of parameters return 1; } %end %override wxPoint_GetY // int GetY() static int LUACALL wxPoint_GetY(lua_State *L) [...4310 lines suppressed...] } %end %override builtin_wxFileSize // %builtin long wxFileSize(const wxString& fileName) int LUACALL builtin_wxFileSize(lua_State *L) { wxString str = lua2wx(lua_tostring(L, 1)); if (!str.IsEmpty()) { wxStructStat statstr; wxStat(str, &statstr); // push the result string lua_pushnumber(L, (int)statstr.st_size); return 1; } return 0; } %end --- NEW FILE: wxluacan_builtin.cpp --- // --------------------------------------------------------- // wxLuaGetBuiltinList_wxluacan() is called by registerGeneratedClasses() // to register object and pointer bindings // // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file // is regenerated // --------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxluacan.h" // %builtin wxlCan* GetCan() static int LUACALL builtin_GetCan(lua_State *L) { wxLuaState wxlState(L); wxlCan *returns; // call GetCan returns = GetCan(); // push the result datatype wxlState.pushuserdatatype(s_wxluatag_wxlCan, returns); return 1; } // %builtin wxlLuaCanCmd* GetCmdhMain() static int LUACALL builtin_GetCmdhMain(lua_State *L) { wxLuaState wxlState(L); wxlLuaCanCmd *returns; // call GetCmdhMain returns = GetCmdhMain(); // push the result datatype wxlState.pushuserdatatype(s_wxluatag_wxlLuaCanCmd, returns); return 1; } WXLUAMETHOD* wxLuaGetBuiltinList_wxluacan(size_t &count) { static WXLUAMETHOD builtinList[] = { { LuaGlobal, "GetCan", builtin_GetCan, 0, 0 }, { LuaGlobal, "GetCmdhMain", builtin_GetCmdhMain, 0, 0 }, { LuaGlobal, 0, 0, 0, 0 }, }; count = (sizeof(builtinList)/sizeof(builtinList[0])) - 1; return builtinList; } --- NEW FILE: Makefile --- # File: Makefile # Author: John Labenski, J Winwood # Created: 2004 # Updated: # Copyright: (c) 2002. J Winwood # # Makefile for wxLuaEditor app using gmake # --- wxLua parameters ------------------------------------------------------- WXLUA_LIBVERSION_CURRENT = 1 WXLUA_LIBVERSION_REVISION = 5 WXLUA_LIBVERSION_AGE = 0 WXLUA_DIR = ../../.. WXLUA_LIBDIR = $(WXEXECDIR) LUA = $(WXLUA_DIR)/bin/lua # ---------------------------------------------------------------------------- # --- wxWidgets parameters from wx-config ------------------------------------ WXCONFIG := wx-config WXPREFIX = $(shell $(WXCONFIG) --prefix) WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) WXRELEASE = $(shell $(WXCONFIG) --release) WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) WXLDLIBS = $(shell $(WXCONFIG) --libs) WXCXX = $(shell $(WXCONFIG) --cxx) WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- CXXFLAGS = $(WXCXXFLAGS) -MMD -g -Wall LDLIBS = $(WXLDLIBS) CXX = $(WXCXX) PROGRAM = wxLuaCan LUA_LIBS = $(WXLUA_DIR)/lib/liblua.a $(WXLUA_DIR)/lib/liblualib.a WXLUA_LIB = $(WXBASENAME)_wxlua-$(WXRELEASE) WXLUADEBUG_LIB = $(WXBASENAME)_wxluadebug-$(WXRELEASE) WXLUASOCKET_LIB = $(WXBASENAME)_wxluasocket-$(WXRELEASE) WXLUABIND_LIB = $(WXBASENAME)_wxluabind-$(WXRELEASE) WXSTC_LIB = $(WXBASENAME)_stc-$(WXRELEASE) WXXRC_LIB = $(WXBASENAME)_xrc-$(WXRELEASE) WXFL_LIB = $(WXBASENAME)_fl-$(WXRELEASE) # The wxSTEditor library name compiled from wxCode/components/wxstedit WXSTEDIT_LIB = $(WXBASENAME)_stedit-$(WXRELEASE) WXSTEDIT_DIR = $(WXCODE)/components/wxstedit APPEXTRADEFS = -I$(WXSTEDIT_DIR)/include -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs #APPEXTRALIBS=-L$(WXLIB_DIR) $(WXLIB_DIR)/lib$(WXLUA_LIB).a $(WXLIB_DIR)/lib$(STC_LIB).a $(WXLIB_DIR)/lib$(WXXRC_LIB).a $(WXLIB_DIR)/lib$(WXFL_LIB).a $(LUA_LIBS) # This will build a shared wxLua app, dynamicly linked to .so libs # -l$(WXFL_LIB) APPEXTRALIBS=-L$(WXLIB_DIR) -L$(WXLUA_LIBDIR) -l$(WXSTC_LIB) -l$(WXSTEDIT_LIB) -l$(WXXRC_LIB) -l$(WXLUABIND_LIB) -l$(WXLUA_LIB) -l$(WXLUADEBUG_LIB) -l$(WXLUASOCKET_LIB) $(LUA_LIBS) OBJECTS = \ cancom.o \ canlua.o \ cansim.o \ wxluacan_builtin.o \ wxluacan_class.o \ wxluacan.o \ wxluacan_define.o \ wxluacan_event.o \ wxluacan_object.o DEPFILES = $(OBJECTS:.o=.d) .cpp.o: $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< all: lua wxLuaLib wxLuaDebugLib wxLuaSocketLib wxLuaBindings $(PROGRAM) $(PROGRAM): $(OBJECTS) $(LUA_LIBS) $(CXX) -o $@ $(OBJECTS) $(LDLIBS) $(APPEXTRALIBS) lua: @(cd $(WXLUA_DIR)/modules/lua && make) bindings: @(cd $(WXLUA_DIR)/bindings/wxwidgets && make) genwxbind: $(WXLUA_DIR)/bin/lua -e"rulesFilename=\"wxluacan.rules.in\"" $(WXLUA_DIR)/bindings/genwxbind.lua > error.txt editor: $(LUA) $(WXLUA_DIR)/util/bin2c/bin2c.lua -t $(WXLUA_DIR)/samples/editor.wx.lua wxLuaEditor > editor.h wxLuaBindings: @(cd $(WXLUA_DIR)/modules/wxbind/src && make) wxLuaLib: @(cd $(WXLUA_DIR)/modules/wxlua/src && make) wxLuaDebugLib: @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make) wxLuaSocketLib: @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make) clean: rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core cleanall: rm -f $(OBJECTS) $(DEPFILES) $(PROGRAM) core @(cd $(WXLUA_DIR)/modules/lua && make clean) @(cd $(WXLUA_DIR)/bindings/wxwidgets && make clean) @(cd $(WXLUA_DIR)/modules/wxbind/src && make clean) @(cd $(WXLUA_DIR)/modules/wxlua/src && make clean) @(cd $(WXLUA_DIR)/modules/wxluadebug/src && make clean) @(cd $(WXLUA_DIR)/modules/wxluasocket/src && make clean) -include $(DEPFILES) --- NEW FILE: wxluacan_define.cpp --- // --------------------------------------------------------- // wxLuaGetDefineList_wxluacan() is called by registerGeneratedClasses() // to register defines, enums and static strings // // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file // is regenerated // --------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxluacan.h" WXLUADEFINE* wxLuaGetDefineList_wxluacan(size_t &count) { static WXLUADEFINE defineList[] = { // ---------------------------------------------------------------------------- // %define // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- // %define %string // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- // %enum // ---------------------------------------------------------------------------- { 0, 0, 0, 0 }, }; count = (sizeof(defineList)/sizeof(defineList[0])) - 1; return defineList; } --- NEW FILE: cansim.h --- /*! \file canvas/samples/cansim/cansim.h \author XX Copyright: 2001-2004 (C) XX Licence: wxWidgets Licence RCS-ID: $Id: cansim.h,v 1.1 2006/02/03 17:06:15 titato Exp $ */ #ifndef __simplecan_H__ #define __simplecan_H__ // Include wxWindows' headers #ifndef WX_PRECOMP #include <wx/wx.h> #endif #include "canlua.h" #include "cancom.h" #include "wx/timer.h" #include "wxluadebug/include/wxldebug.h" #include "wxluasocket/include/wxldserv.h" #include "wxluasocket/include/wxldtarg.h" #include "wxlua/include/internal.h" #include "wxbind/include/wxbind.h" //---------------------------------------------------------------------------- // constants //---------------------------------------------------------------------------- #define ID_QUIT 101 // IDs the menu commands enum { MenuOption_First, Scale_StretchHoriz = MenuOption_First, Scale_ShrinkHoriz, Scale_StretchVertic, Scale_ShrinkVertic, Origin_MoveDown, Origin_MoveUp, Origin_MoveLeft, Origin_MoveRight, Object_AddRect, Object_AddCircle, Axis_Vertic, Map_Restore, MenuOption_Last = Map_Restore, lua_script }; //---------------------------------------------------------------------------- // MyFrame //---------------------------------------------------------------------------- class MyFrame: public wxFrame { public: // constructors and destructors MyFrame( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE ); ~MyFrame(); wxMenu *m_menuObjects; private: // method declarations for MyFrame void CreateMyMenuBar(); private: // member variable declarations for MyFrame wxlCan *m_canvas; wxTimer *m_timer; wxLuaState m_interp; private: void OnUndo(wxCommandEvent& event); void OnRedo(wxCommandEvent& event); // handler declarations for MyFrame void OnQuit( wxCommandEvent &event ); void OnCloseWindow( wxCloseEvent &event ); void OnTimer( wxTimerEvent &event ); void OnOption(wxCommandEvent& event); void OnRunScript(wxCommandEvent& event); double m_xScale; double m_yScale; double m_xOrigin; double m_yOrigin; bool m_yAxisReversed; private: DECLARE_EVENT_TABLE() }; extern wxlCan* mainCan; extern wxlCan* GetCan(); extern wxlLuaCanCmd* GetCmdhMain(); //---------------------------------------------------------------------------- // MyApp //---------------------------------------------------------------------------- class MyApp: public wxApp { DECLARE_EVENT_TABLE() public: MyApp(); virtual bool OnInit(); virtual int OnExit(); void OnLua( wxLuaEvent &event ); MyFrame *m_frame; }; #endif --- NEW FILE: cancom.cpp --- /*! \file cancom.cpp \brief see canvas/include/cancom.h \author Klaas Holwerda Copyright: 2001-2004 (c) Klaas Holwerda Licence: wxWidgets Licence RCS-ID: $Id: cancom.cpp,v 1.1 2006/02/03 17:06:15 titato Exp $ */ #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "cancom.h" IMPLEMENT_CLASS( wxlLuaCanCmd, wxCommandProcessor ) wxlLuaCanCmd::wxlLuaCanCmd( wxlCan* canvas, int maxCommands ) : wxCommandProcessor( maxCommands ) { m_canvas = canvas; } wxlLuaCanCmd::~wxlLuaCanCmd() { } void wxlLuaCanCmd::MoveObject( int index, double x, double y ) { wxlCanObj* canobj = NULL; if ( index < 0 ) canobj = m_canvas->GetRootObject().m_objects.GetLast()->GetData(); else canobj = m_canvas->GetRootObject().GetItem( index ); canobj->SetPos( x, y ); } wxlMoveObjectCmd::wxlMoveObjectCmd( wxlCanObj* object, double x, double y ) :wxCommand( true, wxT("drag object") ) { m_object = object; m_x = x; m_y = y; }; wxlMoveObjectCmd::~wxlMoveObjectCmd() { } bool wxlMoveObjectCmd::Do(void) { double x,y; x = m_object->GetX(); y = m_object->GetY(); m_object->SetPos( m_x, m_y ); // store undo information m_x = x; m_y = y; return true; } bool wxlMoveObjectCmd::Undo(void) { double x,y; x = m_object->GetX(); y = m_object->GetY(); m_object->SetPos( m_x, m_y ); // store undo information m_x = x; m_y = y; return true; } --- NEW FILE: wxluacan_class.cpp --- // --------------------------------------------------------- // wxLuaGetClassList_wxluacan() is called by registerGeneratedClasses() // to register classes // // This file was generated by genwxbind.lua // // Any changes made to this file may be lost when file // is regenerated // --------------------------------------------------------- #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wxluasetup.h" #include "wxlua/include/internal.h" #include "wxluacan.h" // binding class extern WXLUACLASS *wxLuaGetClassList_wxluacan(size_t &count); extern WXLUADEFINE *wxLuaGetDefineList_wxluacan(size_t &count); extern WXLUAEVENT *wxLuaGetEventList_wxluacan(size_t &count); extern WXLUAOBJECT *wxLuaGetObjectList_wxluacan(size_t &count); extern WXLUAMETHOD *wxLuaGetBuiltinList_wxluacan(size_t &count); IMPLEMENT_DYNAMIC_CLASS(wxluacan_Binding, wxLuaBinding) wxluacan_Binding::wxluacan_Binding() : wxLuaBinding() { nameSpace = wxT("wx"); pfGetClassList = wxLuaGetClassList_wxluacan; pfGetDefineList = wxLuaGetDefineList_wxluacan; pfGetEventList = wxLuaGetEventList_wxluacan; pfGetObjectList = wxLuaGetObjectList_wxluacan; pfGetBuiltinList = wxLuaGetBuiltinList_wxluacan; } void wxluacan_Binding::OnRegister(const wxLuaState& wxlState, bool registerTypes, int luaTable) { wxLuaState wxLS(wxlState); wxCHECK_RET(wxLS.Ok(), wxT("Invalid wxLuaState")); // register wxNull if (registerTypes) { wxLS.GetLuaStateRefData()->m_wxLuaNull = wxLS.tnewtag(); } tpushwxLuaNull(wxLS.GetLuaState()); wxLS.tpushusertag(NULL, wxLS.GetLuaStateRefData()->m_wxLuaNull); lua_rawset(wxLS.GetLuaState(), luaTable); } // bind wxluacan functions to lua interpreter bool bind_wxluacan(lua_State* L) { wxLuaState wxlState(L); wxCHECK_MSG(wxlState.Ok(), false, wxT("Invalid wxLuaState")); wxASSERT(!wxlState.GetLuaStateRefData()->m_typesRegistered); wxASSERT(!wxlState.GetLuaBinding(wxT("wxluacan"))); // ignore binding request when we already have wxluacan registered if (wxlState.GetLuaBinding(wxT("wxluacan"))) return false; wxlState.GetLuaStateRefData()->m_bindings.Append(new wxluacan_Binding()); return true; } WXLUACLASS* wxLuaGetClassList_wxluacan(size_t &count) { static WXLUACLASS classList[] = { { "wxlCan", wxlCan_methods, wxlCan_methodCount, -1, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow" }, { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, -1, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor" }, { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, -1, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj" }, { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, -1, NULL, &s_wxluatag_wxlCanObj, "wxObject" }, { 0, 0, 0, 0, 0, 0, 0 }, }; count = (sizeof(classList)/sizeof(classList[0])) - 1; return classList; } class wxluacan_BindingInit : public wxModule { public: wxluacan_BindingInit() {} bool OnInit() { wxLuaBinding::GetBindingList()->Append(&m_binding); return true; } void OnExit() {} wxluacan_Binding m_binding; DECLARE_DYNAMIC_CLASS(wxluacan_BindingInit); }; IMPLEMENT_DYNAMIC_CLASS(wxluacan_BindingInit, wxModule); --- NEW FILE: cancom.h --- /*! \file canvas/include/cancom.h \brief wxlCanCom for do, undo and redo changes in a wxlCan \author Klaas Holwerda Copyright: 2000-2004 (c) Klaas Holwerda Licence: wxWidgets Licence RCS-ID: $Id: cancom.h,v 1.1 2006/02/03 17:06:15 titato Exp $ */ #ifndef __WXLUACANCOM_H__ #define __WXLUACANCOM_H__ #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "canlua.h" #include "wx/cmdproc.h" //! a command interpreter /*! */ class wxlLuaCanCmd : public wxCommandProcessor { DECLARE_CLASS( wxlLuaCanCmd ) public: //! wxlLuaCanCmd wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ); //! destructor ~wxlLuaCanCmd(); void MoveObject( int index, double x, double y ); wxlCan* m_canvas; }; class wxlMoveObjectCmd: public wxCommand { public: wxlMoveObjectCmd( wxlCanObj* object, double x, double y ); ~wxlMoveObjectCmd(void); bool Do(void); bool Undo(void); protected: wxlCanObj* m_object; double m_x, m_y; }; #endif --- NEW FILE: cansim.rc --- ///////////////////////////////////////////////////////////////////////////// // Purpose: Resources for wxLuaStandalone // Author: J Winwood // Created: 04/11/2001 // RCS-ID: $Id: cansim.rc,v 1.1 2006/02/03 17:06:15 titato Exp $ // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// lua ICON "..\\..\\..\\art\\wxlua.ico" //logo BITMAP "..\examples\bitmaps\wxLua.bmp" #include "wx/msw/wx.rc" // 1 24 "wxLua.manifest" // looks horrible! --- NEW FILE: wxluacan.rules --- ------------------------------------------------------------------------------- -- rules to build wxWidgets binding for wxLua (for genwxbind.lua) ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- -- Set the root directory of the wxLua distribution, used only in this file wxluacan_dir = "./" --cdluapath=wxluacan_dir.."/parts/cdlua/" -- FIXME see genwxbind for this ------------------------------------------------------------------------------- -- Set the bindings directory that contains the *.i interface files interface_dir = "." -- Set the directory to output the bindings to, both C++ header and source files output_dir = "." output_header_dir = "." ------------------------------------------------------------------------------- -- Set the lua namespace that the bindings will be placed, eg. wx.wxWindow(...) hook_lua_namespace = "wx" -- Set the C++ "namespace" that the bindings will be placed, eg. function names -- contain this to prevent duplicate function names hook_cpp_namespace = "wxluacan" -- Set any #includes or other C++ code to be placed verbatim at the top of -- every generated file or "" for none hook_header_includes = "" -- Set the name of the subclassed wxLuaBinding class hook_binding_class = hook_cpp_namespace.."_Binding" ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the -- bindings in it. This will be used as #include "hook_header_file" in the C++ -- wrapper files, so it must include the proper #include path. hook_header_file = "wxluacan.h" ------------------------------------------------------------------------------- -- Set the files to output the structs of wrapped defined values, objects, -- events, builtin (static functionc), and classes hook_define_file = hook_cpp_namespace.."_define" hook_define_fn = "wxLuaGetDefineList_"..hook_cpp_namespace hook_object_file = hook_cpp_namespace.."_object" hook_object_fn = "wxLuaGetObjectList_"..hook_cpp_namespace hook_event_file = hook_cpp_namespace.."_event" hook_event_fn = "wxLuaGetEventList_"..hook_cpp_namespace hook_builtin_file = hook_cpp_namespace.."_builtin" hook_builtin_fn = "wxLuaGetBuiltinList_"..hook_cpp_namespace hook_class_file = hook_cpp_namespace.."_class" hook_class_fn = "wxLuaGetClassList_"..hook_cpp_namespace ------------------------------------------------------------------------------- -- generate comments into code comment = true ------------------------------------------------------------------------------- -- Set the file that contains bindings th... [truncated message content] |
From: Klaas H. <ti...@us...> - 2006-02-03 17:06:28
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27363/apps/build/bakefiles Modified Files: apps.bkl options.bkl Log Message: added wxluacan Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/options.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** options.bkl 29 Nov 2005 23:52:11 -0000 1.4 --- options.bkl 3 Feb 2006 17:06:15 -0000 1.5 *************** *** 21,24 **** --- 21,25 ---- --> <set var="USE_WXLUAAPP_DEFAULT">1</set> + <set var="USE_WXLUACANAPP_DEFAULT">1</set> <set var="USE_WXLUAEDITAPP_DEFAULT">0</set> *************** *** 36,39 **** --- 37,46 ---- </option> + <option name="USE_WXLUACANAPP"> + <values>0,1</values> + <default-value>$(USE_WXLUACANAPP_DEFAULT)</default-value> + <description>Compile the wxLuaCan app ?</description> + </option> + <option name="USE_WXLUAEDITAPP"> <values>0,1</values> *************** *** 50,53 **** --- 57,61 ---- of the modules to compile will be left to the user... --> <set var="USE_WXLUAAPP">1</set> + <set var="USE_WXLUACANPP">1</set> <set var="USE_WXLUAEDITAPP">1</set> </if> Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** apps.bkl 3 Feb 2006 16:55:47 -0000 1.21 --- apps.bkl 3 Feb 2006 17:06:15 -0000 1.22 *************** *** 48,51 **** --- 48,53 ---- <set var="WXLUAEDITAPP_HDR">$(fileList('wxluaedit/src/*.h'))</set> + <set var="WXLUACANAPP_SRC">$(fileList('wxluacan/src/*.cpp'))</set> + <set var="WXLUACANAPP_HDR">$(fileList('wxluacan/src/*.h'))</set> *************** *** 113,115 **** --- 115,139 ---- </exe> + <!-- ================================================================== --> + <!-- The WXLUACAN application target --> + <!-- ================================================================== --> + + <exe id="app_wxluacan" template="wxlua" cond="USE_WXLUACANAPP=='1'"> + <app-type>gui</app-type> + <srcdir>$(WXLUA_APPSDIR)</srcdir> + <sources>$(WXLUACANAPP_SRC)</sources> + <headers>$(WXLUACANAPP_HDR)</headers> + + <install-to>$(BINDIR)</install-to> + <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> + + <exename>wxluacan</exename> + <win32-res>wxluacan/src/wxluacan.rc</win32-res> + + <wxlua-alllibs/> + <wx-alllibs/> + + </exe> + + </makefile> |
From: Klaas H. <ti...@us...> - 2006-02-03 17:06:24
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27363/apps/wxluacan/scripts Added Files: incircles.lua Log Message: added wxluacan --- NEW FILE: incircles.lua --- canvas = wx.GetCan() canobjrect = wx.wxlCanObjRect( 30, 40, 100, 20) canvas:AddObject( canobjrect ) canobjrect:SetPending( true ) --blah = wx.wxPageSetupDialogData() --blah:GetPaperSize() |
From: Francesco M. <fr...@us...> - 2006-02-03 16:55:55
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19698/apps/build/msw Modified Files: apps_app_wxlua.dsp apps_app_wxluaedit.dsp makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: removed dummy include from apps.bkl Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** makefile.bcc 2 Feb 2006 23:02:28 -0000 1.19 --- makefile.bcc 3 Feb 2006 16:55:47 -0000 1.20 *************** *** 87,92 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\setup $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ --- 87,91 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ *************** *** 97,102 **** -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ ! -I$(WX_DIR)\contrib\include -I..\..\..\modules\setup $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ --- 96,100 ---- -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ ! -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ borland$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ Index: apps_app_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxlua.dsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** apps_app_wxlua.dsp 2 Feb 2006 23:02:28 -0000 1.10 --- apps_app_wxlua.dsp 3 Feb 2006 16:55:47 -0000 1.11 *************** *** 48,57 **** # PROP Intermediate_Dir "msvc6prjud\app_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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 48,57 ---- # PROP Intermediate_Dir "msvc6prjud\app_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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 73,82 **** # PROP Intermediate_Dir "msvc6prju\app_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 ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 73,82 ---- # PROP Intermediate_Dir "msvc6prju\app_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 ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 98,107 **** # PROP Intermediate_Dir "msvc6prjd\app_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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 98,107 ---- # PROP Intermediate_Dir "msvc6prjd\app_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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 123,132 **** # PROP Intermediate_Dir "msvc6prj\app_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 ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 123,132 ---- # PROP Intermediate_Dir "msvc6prj\app_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 ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 148,157 **** # PROP Intermediate_Dir "msvc6prjud\app_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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 148,157 ---- # PROP Intermediate_Dir "msvc6prjud\app_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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 173,182 **** # PROP Intermediate_Dir "msvc6prju\app_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 ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 173,182 ---- # PROP Intermediate_Dir "msvc6prju\app_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 ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 198,207 **** # PROP Intermediate_Dir "msvc6prjd\app_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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 198,207 ---- # PROP Intermediate_Dir "msvc6prjd\app_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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d _DEBUG BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 223,232 **** # PROP Intermediate_Dir "msvc6prj\app_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 ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 223,232 ---- # PROP Intermediate_Dir "msvc6prj\app_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 ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxlua.pdb /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d _WINDOWS BSC32=bscmake.exe # ADD BASE BSC32 /nologo Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** makefile.wat 2 Feb 2006 23:02:28 -0000 1.19 --- makefile.wat 3 Feb 2006 16:55:47 -0000 1.20 *************** *** 169,174 **** -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. & ! -i=..\..\..\modules\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & --- 169,173 ---- -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj & *************** *** 178,183 **** -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. -i=$(%WXSTEDIT)\include & ! -i=$(WX_DIR)\contrib\include -i=..\..\..\modules\setup $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & --- 177,181 ---- -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. -i=$(%WXSTEDIT)\include & ! -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & watcom$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj & Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** makefile.gcc 2 Feb 2006 23:02:28 -0000 1.20 --- makefile.gcc 3 Feb 2006 16:55:47 -0000 1.21 *************** *** 57,62 **** -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) $(____WX_DEBUG_2) \ ! -I..\..\..\modules -I.\..\..\.. -I..\..\..\modules\setup $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \ --- 57,61 ---- -I$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -I$(WX_DIR)\include \ $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) $(____WX_DEBUG_2) \ ! -I..\..\..\modules -I.\..\..\.. $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ mingw$(WXLIBPOSTFIX)\app_wxlua_wxlua.o \ *************** *** 68,73 **** $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) $(____WX_DEBUG_2) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ ! -I$(WX_DIR)\contrib\include -I..\..\..\modules\setup $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o \ --- 67,71 ---- $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) $(____WX_DEBUG_2) \ -I..\..\..\modules -I.\..\..\.. -I$(WXSTEDIT)\include \ ! -I$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ mingw$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.o \ Index: apps_app_wxluaedit.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/apps_app_wxluaedit.dsp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** apps_app_wxluaedit.dsp 2 Feb 2006 23:02:28 -0000 1.11 --- apps_app_wxluaedit.dsp 3 Feb 2006 16:55:47 -0000 1.12 *************** *** 48,57 **** # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit" # 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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 48,57 ---- # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit" # 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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswud" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 73,82 **** # PROP Intermediate_Dir "msvc6prju\app_wxluaedit" # 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 ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 73,82 ---- # PROP Intermediate_Dir "msvc6prju\app_wxluaedit" # 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 ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswu" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 98,107 **** # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit" # 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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 98,107 ---- # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit" # 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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_dll\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /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 ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\mswd" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 123,132 **** # PROP Intermediate_Dir "msvc6prj\app_wxluaedit" # 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 ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 123,132 ---- # PROP Intermediate_Dir "msvc6prj\app_wxluaedit" # 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 ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_dll\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_dll\msw" /i "$(WXWIN)\include" /d "WXUSINGDLL" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 148,157 **** # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit" # 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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 148,157 ---- # PROP Intermediate_Dir "msvc6prjud\app_wxluaedit" # 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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswud" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswud" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 173,182 **** # PROP Intermediate_Dir "msvc6prju\app_wxluaedit" # 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 ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 173,182 ---- # PROP Intermediate_Dir "msvc6prju\app_wxluaedit" # 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 ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswu" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_UNICODE" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "_UNICODE" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswu" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 198,207 **** # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit" # 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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 198,207 ---- # PROP Intermediate_Dir "msvc6prjd\app_wxluaedit" # 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 ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c ! # ADD CPP /nologo /FD /MDd /GR /EHsc /I "$(WXWIN)\lib\vc_lib\mswd" /I "$(WXWIN)\include" /W4 /Od /I "..\..\..\modules" /I ".\..\..\.." /Zi /Gm /GZ /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXDEBUG__" /D "__WXMSW__" /D "_WINDOWS" /D "_DEBUG" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "__WXDEBUG__" /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\mswd" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /d "_DEBUG" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 223,232 **** # PROP Intermediate_Dir "msvc6prj\app_wxluaedit" # 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 ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /I "..\..\..\modules\setup" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i "$(WXWIN)\contrib\include" /i ..\..\..\modules\setup BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 223,232 ---- # PROP Intermediate_Dir "msvc6prj\app_wxluaedit" # 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 ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c ! # ADD CPP /nologo /FD /MD /GR /EHsc /I "$(WXWIN)\lib\vc_lib\msw" /I "$(WXWIN)\include" /w /O2 /I "..\..\..\modules" /I ".\..\..\.." /Fd..\..\..\bin\wxluaedit.pdb /I "$(WXSTEDIT)\include" /I "$(WXWIN)\contrib\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 ! # ADD BASE RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include ! # ADD RSC /l 0x409 /d "__WXMSW__" /i "$(WXWIN)\lib\vc_lib\msw" /i "$(WXWIN)\include" /i "..\..\..\modules" /i ".\..\..\.." /d "_WINDOWS" /i "$(WXSTEDIT)\include" /i $(WXWIN)\contrib\include BSC32=bscmake.exe # ADD BASE BSC32 /nologo Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** makefile.vc 2 Feb 2006 23:02:28 -0000 1.18 --- makefile.vc 3 Feb 2006 16:55:47 -0000 1.19 *************** *** 61,66 **** /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I..\..\..\modules\setup /GR /EHsc \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ --- 61,65 ---- /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxlua.pdb \ ! /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxlua_wxlua.obj \ *************** *** 73,78 **** $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT)\include \ ! /I$(WX_DIR)\contrib\include /I..\..\..\modules\setup /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ --- 72,76 ---- $(____WX_DEBUG_1) $(______WX_DEBUG) /Fd..\..\..\bin\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /D_WINDOWS /I$(WXSTEDIT)\include \ ! /I$(WX_DIR)\contrib\include /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ msvc$(WXLIBPOSTFIX)\app_wxluaedit_wxledit.obj \ |
From: Francesco M. <fr...@us...> - 2006-02-03 16:55:55
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19698/apps/build/bakefiles Modified Files: apps.bkl Log Message: removed dummy include from apps.bkl Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** apps.bkl 2 Feb 2006 23:02:28 -0000 1.20 --- apps.bkl 3 Feb 2006 16:55:47 -0000 1.21 *************** *** 77,83 **** <win32-res>wxlua/src/wxlua.rc</win32-res> - <!-- always use wxLua's official wxluasetup.h --> - <include>$(WXLUA_BASEDIR)/modules/setup</include> - <wxlua-alllibs/> <wx-alllibs/> --- 77,80 ---- *************** *** 110,116 **** <if cond="TARGETING_WIN32=='1'"><include>$(WX_DIR)/contrib/include</include></if> - <!-- always use wxLua's official wxluasetup.h --> - <include>$(WXLUA_BASEDIR)/modules/setup</include> - <wxlua-alllibs/> <wx-lib>stedit</wx-lib> <!-- Library for wxCode's wxstedit --> --- 107,110 ---- |
From: Francesco M. <fr...@us...> - 2006-02-03 16:55:54
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19698/apps Modified Files: Makefile.in Log Message: removed dummy include from apps.bkl Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Makefile.in 2 Feb 2006 23:02:28 -0000 1.20 --- Makefile.in 3 Feb 2006 16:55:47 -0000 1.21 *************** *** 35,40 **** DESTDIR = ! APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(top_srcdir)/modules/setup $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_wxlua.o \ --- 35,40 ---- DESTDIR = ! APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_wxlua.o \ *************** *** 42,47 **** $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(WXSTEDIT)/include -I$(top_srcdir)/modules/setup $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ --- 42,46 ---- $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(WXSTEDIT)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ |
From: Klaas H. <ti...@us...> - 2006-02-03 16:53:55
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18909/src Log Message: Directory /cvsroot/wxlua/wxLua/apps/wxluacan/src added to the repository |
From: Klaas H. <ti...@us...> - 2006-02-03 16:53:45
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18845/scripts Log Message: Directory /cvsroot/wxlua/wxLua/apps/wxluacan/scripts added to the repository |
From: Klaas H. <ti...@us...> - 2006-02-03 16:53:30
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18783/wxluacan Log Message: Directory /cvsroot/wxlua/wxLua/apps/wxluacan added to the repository |
From: Francesco M. <fr...@us...> - 2006-02-03 16:51:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18016/modules/wxbind/build Modified Files: makefile.bcc makefile.gcc makefile.gnu makefile.vc makefile.wat wxbindcustom.bkl Log Message: now wxbindcustom makefiles work on Unix Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/makefile.bcc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.bcc 2 Feb 2006 23:02:29 -0000 1.1 --- makefile.bcc 3 Feb 2006 16:51:38 -0000 1.2 *************** *** 67,76 **** # The folder where user's custom wxluasetup.h is searched !ifndef WXLUASETUP_DIR ! WXLUASETUP_DIR = ..\..\..\modules\wxbind\src !endif # The folder where user's custom wxLuaBind library is sent !ifndef WXLUABINDLIB_DIR ! WXLUABINDLIB_DIR = ..\..\..\lib !endif --- 67,76 ---- # The folder where user's custom wxluasetup.h is searched !ifndef WXLUASETUP_DIR ! WXLUASETUP_DIR = ../../..\modules\wxbind\setup !endif # The folder where user's custom wxLuaBind library is sent !ifndef WXLUABINDLIB_DIR ! WXLUABINDLIB_DIR = ../../..\lib !endif *************** *** 87,92 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj \ --- 87,91 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I$(WX_DIR)\contrib\include -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj \ *************** *** 130,135 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I..\..\..\modules -I.\..\..\.. -I$(WX_DIR)\contrib\include \ ! -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj \ --- 129,134 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_1) \ ! -I$(WX_DIR)\contrib\include -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ borland$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj \ *************** *** 172,178 **** ### Conditionally set variables: ### - !if "$(WX_DEBUG)" == "1" - WX3RDPARTYLIBPOSTFIX = d - !endif !if "$(WX_SHARED)" == "0" __wxbindcustom_lib___depname = \ --- 171,174 ---- *************** *** 182,191 **** __wxbindcustom_dll___depname = $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll !endif - !if "$(WX_SHARED)" == "0" - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib$(WXLIBPOSTFIX) - !endif - !if "$(WX_SHARED)" == "1" - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll$(WXLIBPOSTFIX) - !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE --- 178,181 ---- *************** *** 195,220 **** !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED = -DWXUSINGDLL ! !endif ! !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG = -O2 ! !endif ! !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG = -Od !endif !if "$(WX_SHARED)" == "0" ! __WXLIBPATH_FILENAMES = \lib\bcc_lib !endif !if "$(WX_SHARED)" == "1" ! __WXLIBPATH_FILENAMES = \lib\bcc_dll !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG_1 = -v- !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG_1 = -v !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" --- 185,204 ---- !endif !if "$(WX_SHARED)" == "0" ! __WXLIBPATH_FILENAMES = \lib\bcc_lib !endif !if "$(WX_SHARED)" == "1" ! __WXLIBPATH_FILENAMES = \lib\bcc_dll !endif !if "$(WX_SHARED)" == "0" ! ____WX_SHARED = !endif !if "$(WX_SHARED)" == "1" ! ____WX_SHARED = -DWXUSINGDLL !endif !if "$(WX_DEBUG)" == "0" ! ____WX_DEBUG = -O2 !endif !if "$(WX_DEBUG)" == "1" ! ____WX_DEBUG = -Od !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" *************** *** 227,230 **** --- 211,220 ---- WXLIBPOSTFIX = ud !endif + !if "$(WX_DEBUG)" == "0" + ____WX_DEBUG_1 = -v- + !endif + !if "$(WX_DEBUG)" == "1" + ____WX_DEBUG_1 = -v + !endif *************** *** 260,265 **** !if "$(WX_SHARED)" == "1" $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_1) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @&&| ! c0d32.obj $(WXBINDCUSTOM_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 $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom $@ --- 250,255 ---- !if "$(WX_SHARED)" == "1" $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(____WX_DEBUG_1) @&&| ! c0d32.obj $(WXBINDCUSTOM_DLL_OBJECTS),$@,, wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib import32.lib cw32.lib,, | implib -f $(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom $@ Index: wxbindcustom.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/wxbindcustom.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxbindcustom.bkl 3 Feb 2006 15:42:54 -0000 1.2 --- wxbindcustom.bkl 3 Feb 2006 16:51:38 -0000 1.3 *************** *** 20,27 **** <!-- the default path for the wxluasetup.h file --> ! <set var="WXLUASETUP_DIR_DEFAULT">$(nativePaths(WXLUA_BASEDIR + '/modules/wxbind/src'))</set> <!-- the default output path for wxLuaBind library --> ! <set var="WXLUABINDLIB_DIR_DEFAULT">$(nativePaths(WXLUA_BASEDIR + '/lib'))</set> --- 20,33 ---- <!-- the default path for the wxluasetup.h file --> ! <set var="WXLUASETUP_DIR_DEFAULT"> ! <if cond="TARGETING_UNIX=='1'">../setup</if> ! <if cond="TARGETING_WIN32=='1'">$(WXLUA_BASEDIR)\modules\wxbind\setup</if> ! </set> <!-- the default output path for wxLuaBind library --> ! <set var="WXLUABINDLIB_DIR_DEFAULT"> ! <if cond="TARGETING_UNIX=='1'">../../../lib</if> ! <if cond="TARGETING_WIN32=='1'">$(WXLUA_BASEDIR)\lib</if> ! </set> *************** *** 54,64 **** <!-- ================================================================== --> ! <!-- the CUSTOM wxBind lib & dll --> ! <wxlua_lib id="wxbindcustom_lib" template="wxlua-lib" cond="WX_SHARED=='0'"> <module-name>WXBINDCUSTOM</module-name> <dirname>$(WXLUABINDLIB_DIR)</dirname> <include>$(WXLUASETUP_DIR)</include> </wxlua_lib> ! <wxlua_dll id="wxbindcustom_dll" template="wxlua" cond="WX_SHARED=='1'"> <module-name>WXBINDCUSTOM</module-name> <dirname>$(WXLUABINDLIB_DIR)</dirname> --- 60,72 ---- <!-- ================================================================== --> ! <!-- the CUSTOM wxBind lib & dll ! NOTE: we won't use the wxlua-lib template since that supposes that you need ! include paths (e.g. WXLUABASEDIR/modules) which we don't need ! --> ! <wxlua_lib id="wxbindcustom_lib" template="wx-lib,wxbase" cond="WX_SHARED=='0'"> <module-name>WXBINDCUSTOM</module-name> <dirname>$(WXLUABINDLIB_DIR)</dirname> <include>$(WXLUASETUP_DIR)</include> </wxlua_lib> ! <wxlua_dll id="wxbindcustom_dll" template="wx-lib,wxbase" cond="WX_SHARED=='1'"> <module-name>WXBINDCUSTOM</module-name> <dirname>$(WXLUABINDLIB_DIR)</dirname> Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/makefile.wat,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.wat 2 Feb 2006 23:02:29 -0000 1.1 --- makefile.wat 3 Feb 2006 16:51:38 -0000 1.2 *************** *** 43,50 **** # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ..\..\..\modules\wxbind\src # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ..\..\..\lib --- 43,50 ---- # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ../../..\modules\wxbind\setup # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ../../..\lib *************** *** 71,78 **** ### Conditionally set variables: ### - WX3RDPARTYLIBPOSTFIX = - !ifeq WX_DEBUG 1 - WX3RDPARTYLIBPOSTFIX = d - !endif __wxbindcustom_lib___depname = !ifeq WX_SHARED 0 --- 71,74 ---- *************** *** 91,101 **** ____WX_DEBUG_14_16 = debug all !endif - __WXLUA_OUTPUT_FOLDER_FILENAMES = - !ifeq WX_SHARED 0 - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_lib$(WXLIBPOSTFIX) - !endif - !ifeq WX_SHARED 1 - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\wat_dll$(WXLIBPOSTFIX) - !endif __WXUNICODE_DEFINE_p = !ifeq WX_UNICODE 1 --- 87,90 ---- *************** *** 106,109 **** --- 95,105 ---- __WXDEBUG_DEFINE_p = -d__WXDEBUG__ !endif + __WXLIBPATH_FILENAMES = + !ifeq WX_SHARED 0 + __WXLIBPATH_FILENAMES = \lib\wat_lib + !endif + !ifeq WX_SHARED 1 + __WXLIBPATH_FILENAMES = \lib\wat_dll + !endif ____WX_SHARED = !ifeq WX_SHARED 0 *************** *** 134,144 **** ____WX_DEBUG_0 = -d2 !endif - __WXLIBPATH_FILENAMES = - !ifeq WX_SHARED 0 - __WXLIBPATH_FILENAMES = \lib\wat_lib - !endif - !ifeq WX_SHARED 1 - __WXLIBPATH_FILENAMES = \lib\wat_dll - !endif WXLIBPOSTFIX = !ifeq WX_DEBUG 0 --- 130,133 ---- *************** *** 163,168 **** -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include -i=$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj & --- 152,157 ---- -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=$(WX_DIR)\contrib\include -i=$(WXLUASETUP_DIR) & ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj & *************** *** 205,211 **** -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(WX_DIR)\contrib\include -dWXBINDCUSTOM_MAKINGDLL -i=$(WXLUASETUP_DIR) & ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj & --- 194,199 ---- -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & -i=$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) & ! $(____WX_DEBUG_0) -i=$(WX_DIR)\contrib\include -dWXBINDCUSTOM_MAKINGDLL & ! -i=$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = & watcom$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj & *************** *** 278,284 **** @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_14_16) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @for %i in ($(WXBINDCUSTOM_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc file %i ! @for %i in ( 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 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) do @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc library %i @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc system nr_dll --- 266,272 ---- @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc name $^@ @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc option caseexact ! @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc $(LDFLAGS) $(____WX_DEBUG_14_16) @for %i in ($(WXBINDCUSTOM_DLL_OBJECTS)) do @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc file %i ! @for %i in ( wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib) do @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc library %i @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc @%append watcom$(WXLIBPOSTFIX)\wxbindcustom_dll.lbc system nr_dll Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/makefile.gcc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.gcc 2 Feb 2006 23:02:29 -0000 1.1 --- makefile.gcc 3 Feb 2006 16:51:38 -0000 1.2 *************** *** 39,46 **** # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ..\..\..\modules\wxbind\src # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ..\..\..\lib --- 39,46 ---- # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ../../..\modules\wxbind\setup # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ../../..\lib *************** *** 57,62 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) \ ! $(____WX_DEBUG_2) -I..\..\..\modules -I.\..\..\.. \ ! -I$(WX_DIR)\contrib\include -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.o \ --- 57,62 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) \ ! $(____WX_DEBUG_2) -I$(WX_DIR)\contrib\include -I$(WXLUASETUP_DIR) \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.o \ *************** *** 100,106 **** -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) \ ! $(____WX_DEBUG_2) -I..\..\..\modules -I.\..\..\.. \ ! -I$(WX_DIR)\contrib\include -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.o \ --- 100,105 ---- -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ -I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG_1) $(____WX_DEBUG) \ ! $(____WX_DEBUG_2) -I$(WX_DIR)\contrib\include -DWXBINDCUSTOM_MAKINGDLL \ ! -I$(WXLUASETUP_DIR) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ mingw$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.o \ *************** *** 143,149 **** ### Conditionally set variables: ### - ifeq ($(WX_DEBUG),1) - WX3RDPARTYLIBPOSTFIX = d - endif ifeq ($(WX_SHARED),0) __wxbindcustom_lib___depname = \ --- 142,145 ---- *************** *** 153,162 **** __wxbindcustom_dll___depname = $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll endif - ifeq ($(WX_SHARED),0) - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_lib$(WXLIBPOSTFIX) - endif - ifeq ($(WX_SHARED),1) - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll$(WXLIBPOSTFIX) - endif ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE --- 149,152 ---- *************** *** 166,169 **** --- 156,165 ---- endif ifeq ($(WX_SHARED),0) + __WXLIBPATH_FILENAMES = \lib\gcc_lib + endif + ifeq ($(WX_SHARED),1) + __WXLIBPATH_FILENAMES = \lib\gcc_dll + endif + ifeq ($(WX_SHARED),0) ____WX_SHARED = endif *************** *** 183,198 **** ____WX_DEBUG = -O0 endif - ifeq ($(WX_SHARED),0) - __WXLIBPATH_FILENAMES = \lib\gcc_lib - endif - ifeq ($(WX_SHARED),1) - __WXLIBPATH_FILENAMES = \lib\gcc_dll - endif - ifeq ($(WX_DEBUG),0) - ____WX_DEBUG_2 = - endif - ifeq ($(WX_DEBUG),1) - ____WX_DEBUG_2 = -g - endif ifeq ($(WX_DEBUG),0) ifeq ($(WX_UNICODE),1) --- 179,182 ---- *************** *** 210,213 **** --- 194,203 ---- endif endif + ifeq ($(WX_DEBUG),0) + ____WX_DEBUG_2 = + endif + ifeq ($(WX_DEBUG),1) + ____WX_DEBUG_2 = -g + endif *************** *** 236,240 **** ifeq ($(WX_SHARED),1) $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDCUSTOM_DLL_OBJECTS) $(LDFLAGS) -mthreads -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_2) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -Wl,--out-implib,$(WXLUABINDLIB_DIR)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.a -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxtiff$(WX3RDPARTYLIBPOSTFIX) -lwxjpeg$(WX3RDPARTYLIBPOSTFIX) -lwxpng$(WX3RDPARTYLIBPOSTFIX) -lwxzlib$(WX3RDPARTYLIBPOSTFIX) -lwxregex$(WXLIBPOSTFIX) -lwxexpat$(WX3RDPARTYLIBPOSTFIX) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 endif --- 226,230 ---- ifeq ($(WX_SHARED),1) $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDCUSTOM_DLL_OBJECTS) $(LDFLAGS) -mthreads $(____WX_DEBUG_2) -Wl,--out-implib,$(WXLUABINDLIB_DIR)\libwxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.a -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml -lwxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core -lwxbase$(WX_VERSION)$(WXLIBPOSTFIX) endif Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/makefile.vc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.vc 2 Feb 2006 23:02:29 -0000 1.1 --- makefile.vc 3 Feb 2006 16:51:38 -0000 1.2 *************** *** 43,50 **** # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ..\..\..\modules\wxbind\src # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ..\..\..\lib --- 43,50 ---- # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ../../..\modules\wxbind\setup # The folder where user's custom wxLuaBind library is sent ! WXLUABINDLIB_DIR = ../../..\lib *************** *** 62,67 **** $(____WX_DEBUG_1) $(______WX_DEBUG) \ /Fd$(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.pdb \ ! /I..\..\..\modules /I.\..\..\.. /I$(WX_DIR)\contrib\include \ ! /I$(WXLUASETUP_DIR) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj \ --- 62,67 ---- $(____WX_DEBUG_1) $(______WX_DEBUG) \ /Fd$(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.pdb \ ! /I$(WX_DIR)\contrib\include /I$(WXLUASETUP_DIR) /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxbindcustom_lib_wxlua.obj \ *************** *** 106,112 **** /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ $(____WX_DEBUG_1) $(______WX_DEBUG) \ ! /Fd$(WXLUABINDLIB_DIR)\wxbindcustom_dll.pdb /I..\..\..\modules \ ! /I.\..\..\.. /I$(WX_DIR)\contrib\include /DWXBINDCUSTOM_MAKINGDLL \ ! /I$(WXLUASETUP_DIR) /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj \ --- 106,112 ---- /I$(WX_DIR)\include $(____WX_SHARED) $(____WX_DEBUG) $(____WX_DEBUG_0) \ $(____WX_DEBUG_1) $(______WX_DEBUG) \ ! /Fd$(WXLUABINDLIB_DIR)\wxbindcustom_dll.pdb /I$(WX_DIR)\contrib\include \ ! /DWXBINDCUSTOM_MAKINGDLL /I$(WXLUASETUP_DIR) /GR /EHsc $(CPPFLAGS) \ ! $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ msvc$(WXLIBPOSTFIX)\wxbindcustom_dll_wxlua.obj \ *************** *** 149,155 **** ### Conditionally set variables: ### - !if "$(WX_DEBUG)" == "1" - WX3RDPARTYLIBPOSTFIX = d - !endif !if "$(WX_SHARED)" == "0" __wxbindcustom_lib___depname = \ --- 149,152 ---- *************** *** 165,174 **** ____WX_DEBUG_20_22 = /DEBUG !endif - !if "$(WX_SHARED)" == "0" - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_lib$(WXLIBPOSTFIX) - !endif - !if "$(WX_SHARED)" == "1" - __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll$(WXLIBPOSTFIX) - !endif !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE --- 162,165 ---- *************** *** 178,181 **** --- 169,178 ---- !endif !if "$(WX_SHARED)" == "0" + __WXLIBPATH_FILENAMES = \lib\vc_lib + !endif + !if "$(WX_SHARED)" == "1" + __WXLIBPATH_FILENAMES = \lib\vc_dll + !endif + !if "$(WX_SHARED)" == "0" ____WX_SHARED = !endif *************** *** 213,222 **** ____WX_DEBUG_2 = d !endif - !if "$(WX_SHARED)" == "0" - __WXLIBPATH_FILENAMES = \lib\vc_lib - !endif - !if "$(WX_SHARED)" == "1" - __WXLIBPATH_FILENAMES = \lib\vc_dll - !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u --- 210,213 ---- *************** *** 258,263 **** !if "$(WX_SHARED)" == "1" $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____WX_DEBUG_20_22) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) @<< ! $(WXBINDCUSTOM_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 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 /IMPLIB:$(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib << !endif --- 249,254 ---- !if "$(WX_SHARED)" == "1" $(WXLUABINDLIB_DIR)\wxbindcustom_dll.dll: $(WXBINDCUSTOM_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(____WX_DEBUG_20_22) @<< ! $(WXBINDCUSTOM_DLL_OBJECTS) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_xrc.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_html.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_media.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_adv.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_net.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX)_xml.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_core.lib wxbase$(WX_VERSION)$(WXLIBPOSTFIX).lib /IMPLIB:$(WXLUABINDLIB_DIR)\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindcustom.lib << !endif Index: makefile.gnu =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/build/makefile.gnu,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.gnu 3 Feb 2006 15:42:54 -0000 1.2 --- makefile.gnu 3 Feb 2006 16:51:38 -0000 1.3 *************** *** 57,61 **** # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ../../../modules/wxbind/src # The folder where user's custom wxLuaBind library is sent --- 57,61 ---- # The folder where user's custom wxluasetup.h is searched ! WXLUASETUP_DIR = ../setup # The folder where user's custom wxLuaBind library is sent *************** *** 71,76 **** CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD ! WXBINDCUSTOM_LIB_CXXFLAGS = -I../../../modules -I./../../.. \ ! -I$(WXLUASETUP_DIR) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ gnu/wxbindcustom_lib_wxlua.o \ --- 71,76 ---- CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD ! WXBINDCUSTOM_LIB_CXXFLAGS = -I$(WXLUASETUP_DIR) $(WX_CXXFLAGS) $(CPPFLAGS) \ ! $(CXXFLAGS) WXBINDCUSTOM_LIB_OBJECTS = \ gnu/wxbindcustom_lib_wxlua.o \ *************** *** 110,116 **** gnu/wxbindcustom_lib_thread.o \ gnu/wxbindcustom_lib_help.o ! WXBINDCUSTOM_DLL_CXXFLAGS = -I../../../modules -I./../../.. \ ! -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) -fPIC -DPIC $(WX_CXXFLAGS) \ ! $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ gnu/wxbindcustom_dll_wxlua.o \ --- 110,115 ---- gnu/wxbindcustom_lib_thread.o \ gnu/wxbindcustom_lib_help.o ! WXBINDCUSTOM_DLL_CXXFLAGS = -DWXBINDCUSTOM_MAKINGDLL -I$(WXLUASETUP_DIR) -fPIC \ ! -DPIC $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) WXBINDCUSTOM_DLL_OBJECTS = \ gnu/wxbindcustom_dll_wxlua.o \ *************** *** 248,252 **** ifeq ($(WX_SHARED),1) $(WXLUABINDLIB_DIR)/libwxlua_$(WX_PORT)_wxbindcustom-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).so: $(WXBINDCUSTOM_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDCUSTOM_DLL_OBJECTS) $(LDFLAGS) -L../../../lib $(WX_LIBS) endif --- 247,251 ---- ifeq ($(WX_SHARED),1) $(WXLUABINDLIB_DIR)/libwxlua_$(WX_PORT)_wxbindcustom-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR).so: $(WXBINDCUSTOM_DLL_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXBINDCUSTOM_DLL_OBJECTS) $(LDFLAGS) $(WX_LIBS) endif |