Menu
▾
▴
wxlua-commit
|
From: Francesco M. <fr...@us...> - 2006-12-12 14:53:51
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11350/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebaked with fixed bakefile: WX_DEBUG and WX_UNICODE options should now disappear Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** makefile.vc 11 Dec 2006 00:08:18 -0000 1.54 --- makefile.vc 12 Dec 2006 14:53:47 -0000 1.55 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 49,52 ---- *************** *** 156,160 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" WX3RDPARTYLIBPOSTFIX = d !endif --- 147,151 ---- ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" WX3RDPARTYLIBPOSTFIX = d !endif *************** *** 211,224 **** __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\vc$(WXLIBPOSTFIX)_dll !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p_10 = /d _UNICODE !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = /D__WXDEBUG__ !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p_10 = /d __WXDEBUG__ !endif --- 202,215 ---- __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\vc$(WXLIBPOSTFIX)_dll !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p = /D_UNICODE !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p_10 = /d _UNICODE !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p = /D__WXDEBUG__ !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p_10 = /d __WXDEBUG__ !endif *************** *** 283,382 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\vc_lib --- 274,373 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib + !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\vc_lib *************** *** 385,397 **** __WXLIBPATH_FILENAMES = \lib\vc_dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif --- 376,388 ---- __WXLIBPATH_FILENAMES = \lib\vc_dll !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif *************** *** 476,480 **** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 467,471 ---- msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 494,498 **** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS $** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 485,489 ---- msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /d _WINDOWS /i ..\..\..\modules\wxbind\setup $** msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** makefile.bcc 11 Dec 2006 00:08:18 -0000 1.54 --- makefile.bcc 12 Dec 2006 14:53:47 -0000 1.55 *************** *** 75,88 **** !endif - # Compile Unicode build of wxWidgets? [0,1] - !ifndef WX_UNICODE - WX_UNICODE = 0 - !endif - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - !ifndef WX_DEBUG - WX_DEBUG = 1 - !endif - # Version of the wx library to build against. !ifndef WX_VERSION --- 75,78 ---- *************** *** 185,189 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" WX3RDPARTYLIBPOSTFIX = d !endif --- 175,179 ---- ### Conditionally set variables: ### ! !if "$(BUILD)" == "debug" WX3RDPARTYLIBPOSTFIX = d !endif *************** *** 240,253 **** __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\bcc$(WXLIBPOSTFIX)_dll !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(WX_UNICODE)" == "1" __WXUNICODE_DEFINE_p_10 = -d_UNICODE !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(WX_DEBUG)" == "1" __WXDEBUG_DEFINE_p_10 = -d__WXDEBUG__ !endif --- 230,243 ---- __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\bcc$(WXLIBPOSTFIX)_dll !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p = -D_UNICODE !endif ! !if "$(UNICODE)" == "1" __WXUNICODE_DEFINE_p_10 = -d_UNICODE !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p = -D__WXDEBUG__ !endif ! !if "$(BUILD)" == "debug" __WXDEBUG_DEFINE_p_10 = -d__WXDEBUG__ !endif *************** *** 276,375 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib ! !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "1" && "$(WX_UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib --- 266,365 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif ! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif ! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "0" + __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib + !endif + !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "1" && "$(UNICODE)" == "1" + __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib + !endif !if "$(WX_SHARED)" == "0" __WXLIBPATH_FILENAMES = \lib\bcc_lib *************** *** 384,396 **** ____BUILD_4 = -v- !endif ! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = u ! !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = ud !endif --- 374,386 ---- ____BUILD_4 = -v- !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" WXLIBPOSTFIX = d !endif ! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1" WXLIBPOSTFIX = ud !endif + !if "$(BUILD)" == "release" && "$(UNICODE)" == "1" + WXLIBPOSTFIX = u + !endif *************** *** 481,485 **** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 471,475 ---- borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 490,494 **** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 480,484 ---- borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 508,512 **** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 498,502 ---- borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. -i..\..\..\modules\wxbind\setup $** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 514,517 **** borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** --- 504,507 ---- borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) -d__WXMSW__ -i$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include $(____SHARED_2) -i..\..\..\modules -i.\..\..\.. $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** makefile.wat 11 Dec 2006 00:08:19 -0000 1.55 --- makefile.wat 12 Dec 2006 14:53:47 -0000 1.56 *************** *** 49,61 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - # 1 - Unicode - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - # 0 - Release - # 1 - Debug - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 49,52 ---- *************** *** 111,115 **** WX3RDPARTYLIBPOSTFIX = ! !ifeq WX_DEBUG 1 WX3RDPARTYLIBPOSTFIX = d !endif --- 102,106 ---- WX3RDPARTYLIBPOSTFIX = ! !ifeq BUILD debug WX3RDPARTYLIBPOSTFIX = d !endif *************** *** 218,457 **** !endif __WXLIB_XRC_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif !endif !endif __WXLIB_HTML_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif !endif !endif __WXLIB_ADV_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif !endif !endif __WXLIB_NET_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif !endif !endif __WXLIB_XML_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif !endif !endif __WXLIB_CORE_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif !endif !endif __WXLIB_BASE_NAME_p = ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib !endif !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 0 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_MONOLITHIC 1 ! !ifeq WX_UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif !endif !endif __WXUNICODE_DEFINE_p = ! !ifeq WX_UNICODE 1 __WXUNICODE_DEFINE_p = -d_UNICODE !endif __WXDEBUG_DEFINE_p = ! !ifeq WX_DEBUG 1 __WXDEBUG_DEFINE_p = -d__WXDEBUG__ !endif --- 209,448 ---- !endif __WXLIB_XRC_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)d_xrc.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)ud_xrc.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)_xrc.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XRC_NAME_p = wxmsw$(WX_VERSION)u_xrc.lib !endif !endif !endif __WXLIB_HTML_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)d_html.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)ud_html.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)_html.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_HTML_NAME_p = wxmsw$(WX_VERSION)u_html.lib !endif !endif !endif __WXLIB_ADV_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)d_adv.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)ud_adv.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)_adv.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_ADV_NAME_p = wxmsw$(WX_VERSION)u_adv.lib !endif !endif !endif __WXLIB_NET_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)d_net.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)ud_net.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)_net.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_NET_NAME_p = wxbase$(WX_VERSION)u_net.lib !endif !endif !endif __WXLIB_XML_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)d_xml.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)ud_xml.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)_xml.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_XML_NAME_p = wxbase$(WX_VERSION)u_xml.lib !endif !endif !endif __WXLIB_CORE_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)d_core.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)ud_core.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)_core.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_CORE_NAME_p = wxmsw$(WX_VERSION)u_core.lib !endif !endif !endif __WXLIB_BASE_NAME_p = ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)ud.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)d.lib !endif !endif !endif ! !ifeq BUILD debug !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)ud.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION).lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 0 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxbase$(WX_VERSION)u.lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 0 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION).lib !endif !endif !endif ! !ifeq BUILD release !ifeq WX_MONOLITHIC 1 ! !ifeq UNICODE 1 ! __WXLIB_BASE_NAME_p = wxmsw$(WX_VERSION)u.lib !endif !endif !endif __WXUNICODE_DEFINE_p = ! !ifeq UNICODE 1 __WXUNICODE_DEFINE_p = -d_UNICODE !endif __WXDEBUG_DEFINE_p = ! !ifeq BUILD debug __WXDEBUG_DEFINE_p = -d__WXDEBUG__ !endif *************** *** 471,489 **** !endif WXLIBPOSTFIX = ! !ifeq WX_DEBUG 0 ! !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = u ! !endif ! !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq WX_DEBUG 1 ! !ifeq WX_UNICODE 1 WXLIBPOSTFIX = ud !endif !endif ### Variables: ### --- 462,480 ---- !endif WXLIBPOSTFIX = ! !ifeq BUILD debug ! !ifeq UNICODE 0 WXLIBPOSTFIX = d !endif !endif ! !ifeq BUILD debug ! !ifeq UNICODE 1 WXLIBPOSTFIX = ud !endif !endif + !ifeq BUILD release + !ifeq UNICODE 1 + WXLIBPOSTFIX = u + !endif + !endif ### Variables: ### *************** *** 634,638 **** watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.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 $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp --- 625,629 ---- watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua.res : .AUTODEPEND ..\..\wxlua\src\wxlua.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 $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj : .AUTODEPEND ..\..\wxluaedit\src\wxledit.cpp *************** *** 643,647 **** watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res : .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.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 $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp --- 634,638 ---- watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res : .AUTODEPEND ..\..\wxluaedit\src\wxluaedit.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 $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp *************** *** 661,665 **** watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res : .AUTODEPEND ..\..\wxluacan\src\cansim.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 $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.cpp --- 652,656 ---- watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim.res : .AUTODEPEND ..\..\wxluacan\src\cansim.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 $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. -i=..\..\..\modules\wxbind\setup $< watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 667,670 **** watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.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 $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< --- 658,661 ---- watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res : .AUTODEPEND ..\..\wxluafreeze\src\wxluafreeze.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 $(____SHARED) -i=..\..\..\modules -i=.\..\..\.. $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** makefile.gcc 11 Dec 2006 00:08:18 -0000 1.55 --- makefile.gcc 12 Dec 2006 14:53:47 -0000 1.56 *************** *** 44,53 **** WX_SHARED = 0 - # Compile Unicode build of wxWidgets? [0,1] - WX_UNICODE = 0 - - # Use debug build of wxWidgets (define __WXDEBUG__)? [0,1] - WX_DEBUG = 1 - # Version of the wx library to build against. WX_VERSION = 26 --- 44,47 ---- *************** *** 135,139 **** ### Conditionally set variables: ### ! ifeq ($(WX_DEBUG),1) WX3RDPARTYLIBPOSTFIX = d endif --- 129,133 ---- ### Conditionally set variables: ### ! ifeq ($(BUILD),debug) WX3RDPARTYLIBPOSTFIX = d endif *************** *** 196,209 **** __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\gcc$(WXLIBPOSTFIX)_dll endif ! ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ! ifeq ($(WX_UNICODE),1) __WXUNICODE_DEFINE_p_10 = --define _UNICODE endif ! ifeq ($(WX_DEBUG),1) __WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif ! ifeq ($(WX_DEBUG),1) __WXDEBUG_DEFINE_p_10 = --define __WXDEBUG__ endif --- 190,203 ---- __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\gcc$(WXLIBPOSTFIX)_dll endif ! ifeq ($(UNICODE),1) __WXUNICODE_DEFINE_p = -D_UNICODE endif ! ifeq ($(UNICODE),1) __WXUNICODE_DEFINE_p_10 = --define _UNICODE endif ! ifeq ($(BUILD),debug) __WXDEBUG_DEFINE_p = -D__WXDEBUG__ endif ! ifeq ($(BUILD),debug) __WXDEBUG_DEFINE_p_10 = --define __WXDEBUG__ endif *************** *** 238,462 **** __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)_xrc ! endif ! endif ! endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)u_xrc ! endif ! endif ! endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)d_xrc endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)ud_xrc endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)_html endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)u_html endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)d_html endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)ud_html endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)_adv endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)u_adv endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)d_adv endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)ud_adv endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)_net endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)u_net endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)d_net endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)ud_net endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)_xml endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)u_xml endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)d_xml endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)ud_xml endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)_core endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)u_core endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)d_core endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)ud_core endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION) endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION) endif endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)u endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)d endif endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(WX_UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)ud endif endif --- 232,456 ---- __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)d_xrc endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)ud_xrc endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)_xrc endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_XRC_NAME_p = -lwxmsw$(WX_VERSION)u_xrc endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)d_html endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)ud_html endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)_html endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_HTML_NAME_p = -lwxmsw$(WX_VERSION)u_html endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)d_adv endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)ud_adv endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)_adv endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_ADV_NAME_p = -lwxmsw$(WX_VERSION)u_adv endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)d_net endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)ud_net endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)_net endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_NET_NAME_p = -lwxbase$(WX_VERSION)u_net endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)d_xml endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)ud_xml endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)_xml endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_XML_NAME_p = -lwxbase$(WX_VERSION)u_xml endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)d_core endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)ud_core endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)_core endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_CORE_NAME_p = -lwxmsw$(WX_VERSION)u_core endif endif endif ! ifeq ($(BUILD),debug) ! ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)d ! endif ! endif ! endif ! ifeq ($(BUILD),debug) ! ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)ud ! endif ! endif ! endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)d endif endif endif ! ifeq ($(BUILD),debug) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)ud endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION) endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),0) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxbase$(WX_VERSION)u endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),0) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION) endif endif endif ! ifeq ($(BUILD),release) ifeq ($(WX_MONOLITHIC),1) ! ifeq ($(UNICODE),1) ! __WXLIB_BASE_NAME_p = -lwxmsw$(WX_VERSION)u endif endif *************** *** 474,492 **** ____BUILD_8 = endif ! ifeq ($(WX_DEBUG),0) ! ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u ! endif ! endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(WX_DEBUG),1) ! ifeq ($(WX_UNICODE),1) WXLIBPOSTFIX = ud endif endif --- 468,486 ---- ____BUILD_8 = endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),0) WXLIBPOSTFIX = d endif endif ! ifeq ($(BUILD),debug) ! ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud endif endif + ifeq ($(BUILD),release) + ifeq ($(UNICODE),1) + WXLIBPOSTFIX = u + endif + endif *************** *** 547,551 **** mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp --- 541,545 ---- mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxlua_wxlua_rc.o: ../../wxlua/src/wxlua.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxledit.o: ../../wxluaedit/src/wxledit.cpp *************** *** 556,560 **** mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp --- 550,554 ---- mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit_rc.o: ../../wxluaedit/src/wxluaedit.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp *************** *** 574,578 **** mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim_rc.o: ../../wxluacan/src/cansim.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o: ../../wxluafreeze/src/wxluafreeze.cpp --- 568,572 ---- mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluacan_cansim_rc.o: ../../wxluacan/src/cansim.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. --include-dir ../../../modules/wxbind/setup mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.o: ../../wxluafreeze/src/wxluafreeze.cpp *************** *** 580,584 **** mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o: ../../wxluafreeze/src/wxluafreeze.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. .PHONY: all clean --- 574,578 ---- mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze_rc.o: ../../wxluafreeze/src/wxluafreeze.rc ! windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include $(____SHARED_2) --include-dir ../../../modules --include-dir ./../../.. .PHONY: all clean |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X