wxlua-commit

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/build/msw
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11350/modules/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/modules/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:20 -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 ----
***************
*** 394,398 ****
  ### Conditionally set variables: ###
  
! !if "$(WX_DEBUG)" == "1"
  WX3RDPARTYLIBPOSTFIX = d
  !endif
--- 385,389 ----
  ### Conditionally set variables: ###
  
! !if "$(BUILD)" == "debug"
  WX3RDPARTYLIBPOSTFIX = d
  !endif
***************
*** 454,484 ****
  __mod_luamodule___depname = ..\..\..\lib\vc_dll\wx.dll
  !endif
! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib
! !endif
! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib
! !endif
! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
  __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib
  !endif
! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
  __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib
  !endif
! !if "$(WX_UNICODE)" == "1"
  __WXUNICODE_DEFINE_p = /D_UNICODE
  !endif
! !if "$(WX_DEBUG)" == "1"
  __WXDEBUG_DEFINE_p = /D__WXDEBUG__
  !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
  !if "$(SHARED)" == "0"
  ____SHARED = 
--- 445,475 ----
  __mod_luamodule___depname = ..\..\..\lib\vc_dll\wx.dll
  !endif
! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0"
  __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib
  !endif
! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1"
  __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib
  !endif
! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0"
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib
! !endif
! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1"
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib
! !endif
! !if "$(UNICODE)" == "1"
  __WXUNICODE_DEFINE_p = /D_UNICODE
  !endif
! !if "$(BUILD)" == "debug"
  __WXDEBUG_DEFINE_p = /D__WXDEBUG__
  !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
  !if "$(SHARED)" == "0"
  ____SHARED = 
***************
*** 529,628 ****
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll
  !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_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_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_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_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_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_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_SHARED)" == "0"
  __WXLIBPATH_FILENAMES = \lib\vc_lib
--- 520,619 ----
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\vc_dll
  !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 "$(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_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_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_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_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_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 "$(WX_SHARED)" == "0"
  __WXLIBPATH_FILENAMES = \lib\vc_lib

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** makefile.bcc	11 Dec 2006 00:08:19 -0000	1.55
--- makefile.bcc	12 Dec 2006 14:53:47 -0000	1.56
***************
*** 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 ----
***************
*** 391,395 ****
  ### Conditionally set variables: ###
  
! !if "$(WX_DEBUG)" == "1"
  WX3RDPARTYLIBPOSTFIX = d
  !endif
--- 381,385 ----
  ### Conditionally set variables: ###
  
! !if "$(BUILD)" == "debug"
  WX3RDPARTYLIBPOSTFIX = d
  !endif
***************
*** 451,481 ****
  __mod_luamodule___depname = ..\..\..\lib\bcc_dll\wx.dll
  !endif
! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib
! !endif
! !if "$(WX_DEBUG)" == "0" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib
! !endif
! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "0"
  __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib
  !endif
! !if "$(WX_DEBUG)" == "1" && "$(WX_MONOLITHIC)" == "0" && "$(WX_UNICODE)" == "1"
  __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib
  !endif
! !if "$(WX_UNICODE)" == "1"
  __WXUNICODE_DEFINE_p = -D_UNICODE
  !endif
! !if "$(WX_DEBUG)" == "1"
  __WXDEBUG_DEFINE_p = -D__WXDEBUG__
  !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
  !if "$(SHARED)" == "0"
  ____SHARED = 
--- 441,471 ----
  __mod_luamodule___depname = ..\..\..\lib\bcc_dll\wx.dll
  !endif
! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0"
  __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib
  !endif
! !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1"
  __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib
  !endif
! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0"
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib
! !endif
! !if "$(BUILD)" == "release" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "1"
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib
! !endif
! !if "$(UNICODE)" == "1"
  __WXUNICODE_DEFINE_p = -D_UNICODE
  !endif
! !if "$(BUILD)" == "debug"
  __WXDEBUG_DEFINE_p = -D__WXDEBUG__
  !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
  !if "$(SHARED)" == "0"
  ____SHARED = 
***************
*** 496,595 ****
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll
  !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_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_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_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_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_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_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_SHARED)" == "0"
  __WXLIBPATH_FILENAMES = \lib\bcc_lib
--- 486,585 ----
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_dll
  !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 "$(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_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_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_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_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_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 "$(WX_SHARED)" == "0"
  __WXLIBPATH_FILENAMES = \lib\bcc_lib

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** makefile.wat	11 Dec 2006 00:08:21 -0000	1.54
--- makefile.wat	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 ----
***************
*** 102,106 ****
  
  WX3RDPARTYLIBPOSTFIX =
! !ifeq WX_DEBUG 1
  WX3RDPARTYLIBPOSTFIX = d
  !endif
--- 93,97 ----
  
  WX3RDPARTYLIBPOSTFIX =
! !ifeq BUILD debug
  WX3RDPARTYLIBPOSTFIX = d
  !endif
***************
*** 191,246 ****
  !endif
  __WXLIB_MEDIA_NAME_p =
! !ifeq WX_DEBUG 0
  !ifeq WX_MONOLITHIC 0
! !ifeq WX_UNICODE 0
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib
  !endif
  !endif
  !endif
! !ifeq WX_DEBUG 0
  !ifeq WX_MONOLITHIC 0
! !ifeq WX_UNICODE 1
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.lib
  !endif
  !endif
  !endif
! !ifeq WX_DEBUG 1
  !ifeq WX_MONOLITHIC 0
! !ifeq WX_UNICODE 0
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib
  !endif
  !endif
  !endif
! !ifeq WX_DEBUG 1
  !ifeq WX_MONOLITHIC 0
! !ifeq WX_UNICODE 1
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.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
  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
  ____SHARED =
  !ifeq SHARED 0
--- 182,237 ----
  !endif
  __WXLIB_MEDIA_NAME_p =
! !ifeq BUILD debug
  !ifeq WX_MONOLITHIC 0
! !ifeq UNICODE 0
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib
  !endif
  !endif
  !endif
! !ifeq BUILD debug
  !ifeq WX_MONOLITHIC 0
! !ifeq UNICODE 1
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)ud_media.lib
  !endif
  !endif
  !endif
! !ifeq BUILD release
  !ifeq WX_MONOLITHIC 0
! !ifeq UNICODE 0
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)_media.lib
  !endif
  !endif
  !endif
! !ifeq BUILD release
  !ifeq WX_MONOLITHIC 0
! !ifeq UNICODE 1
! __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)u_media.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
  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
  ____SHARED =
  !ifeq SHARED 0
***************
*** 286,516 ****
  !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
  __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_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_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_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_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_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
--- 277,507 ----
  !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
  __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_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_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_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_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_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

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/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:19 -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 ----
***************
*** 331,335 ****
  ### Conditionally set variables: ###
  
! ifeq ($(WX_DEBUG),1)
  WX3RDPARTYLIBPOSTFIX = d
  endif
--- 325,329 ----
  ### Conditionally set variables: ###
  
! ifeq ($(BUILD),debug)
  WX3RDPARTYLIBPOSTFIX = d
  endif
***************
*** 405,457 ****
  endif
  endif
! ifeq ($(WX_DEBUG),0)
  ifeq ($(WX_MONOLITHIC),0)
! ifeq ($(WX_UNICODE),0)
! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)_media
  endif
  endif
  endif
! ifeq ($(WX_DEBUG),0)
  ifeq ($(WX_MONOLITHIC),0)
! ifeq ($(WX_UNICODE),1)
! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)u_media
  endif
  endif
  endif
! ifeq ($(WX_DEBUG),1)
  ifeq ($(WX_MONOLITHIC),0)
! ifeq ($(WX_UNICODE),0)
! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)d_media
  endif
  endif
  endif
! ifeq ($(WX_DEBUG),1)
  ifeq ($(WX_MONOLITHIC),0)
! ifeq ($(WX_UNICODE),1)
! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)ud_media
  endif
  endif
  endif
! ifeq ($(WX_UNICODE),1)
  __WXUNICODE_DEFINE_p = -D_UNICODE
  endif
! ifeq ($(WX_DEBUG),1)
  __WXDEBUG_DEFINE_p = -D__WXDEBUG__
  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
  ifeq ($(SHARED),0)
  ____SHARED = 
--- 399,451 ----
  endif
  endif
! ifeq ($(BUILD),debug)
  ifeq ($(WX_MONOLITHIC),0)
! ifeq ($(UNICODE),0)
! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)d_media
  endif
  endif
  endif
! ifeq ($(BUILD),debug)
  ifeq ($(WX_MONOLITHIC),0)
! ifeq ($(UNICODE),1)
! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)ud_media
  endif
  endif
  endif
! ifeq ($(BUILD),release)
  ifeq ($(WX_MONOLITHIC),0)
! ifeq ($(UNICODE),0)
! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)_media
  endif
  endif
  endif
! ifeq ($(BUILD),release)
  ifeq ($(WX_MONOLITHIC),0)
! ifeq ($(UNICODE),1)
! __WXLIB_MEDIA_NAME_p = -lwxmsw$(WX_VERSION)u_media
  endif
  endif
  endif
! ifeq ($(UNICODE),1)
  __WXUNICODE_DEFINE_p = -D_UNICODE
  endif
! ifeq ($(BUILD),debug)
  __WXDEBUG_DEFINE_p = -D__WXDEBUG__
  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
  ifeq ($(SHARED),0)
  ____SHARED = 
***************
*** 478,705 ****
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll
  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
! 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_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_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_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_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_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_SHARED),0)
  __WXLIBPATH_FILENAMES = \lib\gcc_lib
--- 472,699 ----
  __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\gcc_dll
  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
  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_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_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_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_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_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 ($(WX_SHARED),0)
  __WXLIBPATH_FILENAMES = \lib\gcc_lib