[Wxlua-commit] wxLua/build/msw makefile.bcc, 1.31, 1.32 makefile.gcc, 1.32, 1.33 makefile.vc, 1.34, 1.35 makefile.wat, 1.33, 1.34

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

Update of /cvsroot/wxlua/wxLua/build/msw
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/build/msw

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
Switched to latest patched bakefile (which only differs for option renaming feature).
Removed customized build of LUA interpreter: we now use vanilla lua.
Now BUILDDIR is set differently for shared and static builds to avoid clashes.


Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** makefile.vc	20 May 2006 13:12:34 -0000	1.34
--- makefile.vc	8 Dec 2006 13:19:58 -0000	1.35
***************
*** 49,52 ****
--- 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
***************
*** 98,120 ****
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \
  	UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \
! 	WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \
! 	WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \
! 	USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \
! 	WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
  ### Conditionally set variables: ###
  
! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1"
  WXLIBPOSTFIX = ud
  !endif
! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0"
  WXLIBPOSTFIX = d
  !endif
! !if "$(BUILD)" == "release" && "$(UNICODE)" == "1"
  WXLIBPOSTFIX = u
  !endif
  !if "$(USE_APPS)" == "1"
  __apps___depname = sub_apps
--- 107,136 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \
  	UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \
! 	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
! 	WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \
! 	USE_APPS="$(USE_APPS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \
! 	USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \
! 	USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
  ### Conditionally set variables: ###
  
! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1"
  WXLIBPOSTFIX = ud
  !endif
! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0"
  WXLIBPOSTFIX = d
  !endif
! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1"
  WXLIBPOSTFIX = u
  !endif
+ !if "$(SHARED)" == "0"
+ SHARED_SUFFIX = static
+ !endif
+ !if "$(SHARED)" == "1"
+ SHARED_SUFFIX = shared
+ !endif
  !if "$(USE_APPS)" == "1"
  __apps___depname = sub_apps
***************
*** 122,128 ****
  
  
! all: msvc$(WXLIBPOSTFIX)
! msvc$(WXLIBPOSTFIX):
! 	-if not exist msvc$(WXLIBPOSTFIX) mkdir msvc$(WXLIBPOSTFIX)
  
  ### Targets: ###
--- 138,144 ----
  
  
! all: msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
! msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX):
! 	-if not exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 131,137 ****
  
  clean: 
! 	-if exist msvc$(WXLIBPOSTFIX)\*.obj del msvc$(WXLIBPOSTFIX)\*.obj
! 	-if exist msvc$(WXLIBPOSTFIX)\*.res del msvc$(WXLIBPOSTFIX)\*.res
! 	-if exist msvc$(WXLIBPOSTFIX)\*.pch del msvc$(WXLIBPOSTFIX)\*.pch
  	cd ..\..\modules\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS) clean
--- 147,153 ----
  
  clean: 
! 	-if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj
! 	-if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res
! 	-if exist msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch del msvc$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch
  	cd ..\..\modules\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS) clean

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** makefile.bcc	20 May 2006 13:12:34 -0000	1.31
--- makefile.bcc	8 Dec 2006 13:19:58 -0000	1.32
***************
*** 75,78 ****
--- 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
***************
*** 147,150 ****
--- 157,161 ----
  	-DBUILD="$(BUILD)" -DUNICODE="$(UNICODE)" -DSHARED="$(SHARED)" \
  	-DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \
+ 	-DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \
  	-DWX_VERSION="$(WX_VERSION)" -DWX_MONOLITHIC="$(WX_MONOLITHIC)" \
  	-DUSE_APPS="$(USE_APPS)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \
***************
*** 157,169 ****
  ### Conditionally set variables: ###
  
! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "1"
  WXLIBPOSTFIX = ud
  !endif
! !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0"
  WXLIBPOSTFIX = d
  !endif
! !if "$(BUILD)" == "release" && "$(UNICODE)" == "1"
  WXLIBPOSTFIX = u
  !endif
  !if "$(USE_APPS)" == "1"
  __apps___depname = apps
--- 168,198 ----
  ### Conditionally set variables: ###
  
! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1"
  WXLIBPOSTFIX = ud
  !endif
! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0"
  WXLIBPOSTFIX = d
  !endif
! !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1"
  WXLIBPOSTFIX = u
  !endif
+ !if "$(BUILD)" == "debug"
+ WX_DEBUG = 1
+ !endif
+ !if "$(BUILD)" == "release"
+ WX_DEBUG = 0
+ !endif
+ !if "$(UNICODE)" == "0"
+ WX_UNICODE = 0
+ !endif
+ !if "$(UNICODE)" == "1"
+ WX_UNICODE = 1
+ !endif
+ !if "$(SHARED)" == "0"
+ SHARED_SUFFIX = static
+ !endif
+ !if "$(SHARED)" == "1"
+ SHARED_SUFFIX = shared
+ !endif
  !if "$(USE_APPS)" == "1"
  __apps___depname = apps
***************
*** 171,177 ****
  
  
! all: borland$(WXLIBPOSTFIX)
! borland$(WXLIBPOSTFIX):
! 	-if not exist borland$(WXLIBPOSTFIX) mkdir borland$(WXLIBPOSTFIX)
  
  ### Targets: ###
--- 200,206 ----
  
  
! all: borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
! borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX):
! 	-if not exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 180,194 ****
  
  clean: 
! 	-if exist borland$(WXLIBPOSTFIX)\*.obj del borland$(WXLIBPOSTFIX)\*.obj
! 	-if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res
! 	-if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm
! 	@echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\modules.bat
! 	call borland$(WXLIBPOSTFIX)\modules.bat
! 	@del borland$(WXLIBPOSTFIX)\modules.bat
! 	@echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\apps.bat
! 	call borland$(WXLIBPOSTFIX)\apps.bat
! 	@del borland$(WXLIBPOSTFIX)\apps.bat
  
  ..\..\lib\bcc_lib: 
--- 209,223 ----
  
  clean: 
! 	-if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj
! 	-if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res
! 	-if exist borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.csm
! 	@echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	@del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	@echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	@del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
  
  ..\..\lib\bcc_lib: 
***************
*** 202,216 ****
  
  modules: 
! 	@echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS)  >>borland$(WXLIBPOSTFIX)\modules.bat
! 	call borland$(WXLIBPOSTFIX)\modules.bat
! 	@del borland$(WXLIBPOSTFIX)\modules.bat
  
  !if "$(USE_APPS)" == "1"
  apps: 
! 	@echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS)  >>borland$(WXLIBPOSTFIX)\apps.bat
! 	call borland$(WXLIBPOSTFIX)\apps.bat
! 	@del borland$(WXLIBPOSTFIX)\apps.bat
  !endif
  
--- 231,245 ----
  
  modules: 
! 	@echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS)  >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
! 	@del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\modules.bat
  
  !if "$(USE_APPS)" == "1"
  apps: 
! 	@echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS)  >>borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	call borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
! 	@del borland$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\apps.bat
  !endif
  

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** makefile.wat	20 May 2006 13:12:34 -0000	1.33
--- makefile.wat	8 Dec 2006 13:19:58 -0000	1.34
***************
*** 49,52 ****
--- 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
***************
*** 111,129 ****
  
  WXLIBPOSTFIX =
! !ifeq BUILD debug
! !ifeq UNICODE 1
  WXLIBPOSTFIX = ud
  !endif
  !endif
! !ifeq BUILD debug
! !ifeq UNICODE 0
  WXLIBPOSTFIX = d
  !endif
  !endif
! !ifeq BUILD release
! !ifeq UNICODE 1
  WXLIBPOSTFIX = u
  !endif
  !endif
  __apps___depname =
  !ifeq USE_APPS 1
--- 120,145 ----
  
  WXLIBPOSTFIX =
! !ifeq WX_DEBUG 1
! !ifeq WX_UNICODE 1
  WXLIBPOSTFIX = ud
  !endif
  !endif
! !ifeq WX_DEBUG 1
! !ifeq WX_UNICODE 0
  WXLIBPOSTFIX = d
  !endif
  !endif
! !ifeq WX_DEBUG 0
! !ifeq WX_UNICODE 1
  WXLIBPOSTFIX = u
  !endif
  !endif
+ SHARED_SUFFIX =
+ !ifeq SHARED 0
+ SHARED_SUFFIX = static
+ !endif
+ !ifeq SHARED 1
+ SHARED_SUFFIX = shared
+ !endif
  __apps___depname =
  !ifeq USE_APPS 1
***************
*** 136,151 ****
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" &
  	UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" &
! 	WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" &
! 	WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" &
! 	USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" &
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" &
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" &
! 	WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" &
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
  
! all : watcom$(WXLIBPOSTFIX)
! watcom$(WXLIBPOSTFIX) :
! 	-if not exist watcom$(WXLIBPOSTFIX) mkdir watcom$(WXLIBPOSTFIX)
  
  ### Targets: ###
--- 152,168 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" &
  	UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" &
! 	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" &
! 	WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" &
! 	USE_APPS="$(USE_APPS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" &
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" &
! 	USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" &
! 	USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" &
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" &
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
  
! all : watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
! watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) :
! 	-if not exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 154,162 ****
  
  clean : .SYMBOLIC 
! 	-if exist watcom$(WXLIBPOSTFIX)\*.obj del watcom$(WXLIBPOSTFIX)\*.obj
! 	-if exist watcom$(WXLIBPOSTFIX)\*.res del watcom$(WXLIBPOSTFIX)\*.res
! 	-if exist watcom$(WXLIBPOSTFIX)\*.lbc del watcom$(WXLIBPOSTFIX)\*.lbc
! 	-if exist watcom$(WXLIBPOSTFIX)\*.ilk del watcom$(WXLIBPOSTFIX)\*.ilk
! 	-if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch
  	cd ..\..\modules\build\msw
  	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
--- 171,179 ----
  
  clean : .SYMBOLIC 
! 	-if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.obj
! 	-if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.res
! 	-if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.lbc del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.lbc
! 	-if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.ilk del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.ilk
! 	-if exist watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch del watcom$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.pch
  	cd ..\..\modules\build\msw
  	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** makefile.gcc	20 May 2006 13:12:34 -0000	1.32
--- makefile.gcc	8 Dec 2006 13:19:58 -0000	1.33
***************
*** 44,47 ****
--- 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
***************
*** 91,119 ****
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \
  	UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \
! 	WX_SHARED="$(WX_SHARED)" WX_VERSION="$(WX_VERSION)" \
! 	WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \
! 	USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
! 	USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \
! 	USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \
! 	WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
  ### Conditionally set variables: ###
  
! ifeq ($(BUILD),debug)
! ifeq ($(UNICODE),1)
  WXLIBPOSTFIX = ud
  endif
  endif
! ifeq ($(BUILD),debug)
! ifeq ($(UNICODE),0)
  WXLIBPOSTFIX = d
  endif
  endif
! ifeq ($(BUILD),release)
! ifeq ($(UNICODE),1)
  WXLIBPOSTFIX = u
  endif
  endif
  ifeq ($(USE_APPS),1)
  __apps___depname = apps
--- 97,132 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" BUILD="$(BUILD)" \
  	UNICODE="$(UNICODE)" SHARED="$(SHARED)" WX_DIR="$(WX_DIR)" \
! 	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
! 	WX_VERSION="$(WX_VERSION)" WX_MONOLITHIC="$(WX_MONOLITHIC)" \
! 	USE_APPS="$(USE_APPS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \
! 	USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \
! 	USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \
! 	USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \
  	USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)"
  
  ### Conditionally set variables: ###
  
! ifeq ($(WX_DEBUG),1)
! ifeq ($(WX_UNICODE),1)
  WXLIBPOSTFIX = ud
  endif
  endif
! ifeq ($(WX_DEBUG),1)
! ifeq ($(WX_UNICODE),0)
  WXLIBPOSTFIX = d
  endif
  endif
! ifeq ($(WX_DEBUG),0)
! ifeq ($(WX_UNICODE),1)
  WXLIBPOSTFIX = u
  endif
  endif
+ ifeq ($(SHARED),0)
+ SHARED_SUFFIX = static
+ endif
+ ifeq ($(SHARED),1)
+ SHARED_SUFFIX = shared
+ endif
  ifeq ($(USE_APPS),1)
  __apps___depname = apps
***************
*** 121,127 ****
  
  
! all: mingw$(WXLIBPOSTFIX)
! mingw$(WXLIBPOSTFIX):
! 	-if not exist mingw$(WXLIBPOSTFIX) mkdir mingw$(WXLIBPOSTFIX)
  
  ### Targets: ###
--- 134,140 ----
  
  
! all: mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
! mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX):
! 	-if not exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX) mkdir mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)
  
  ### Targets: ###
***************
*** 130,135 ****
  
  clean: 
! 	-if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o
! 	-if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d
  	$(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean
  	$(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean
--- 143,148 ----
  
  clean: 
! 	-if exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.o del mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.o
! 	-if exist mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.d del mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)\*.d
  	$(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean
  	$(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean
***************
*** 171,173 ****
  
  # Dependencies tracking:
! -include mingw$(WXLIBPOSTFIX)/*.d
--- 184,186 ----
  
  # Dependencies tracking:
! -include mingw$(WXLIBPOSTFIX)_$(SHARED_SUFFIX)/*.d