[Wxlua-commit] wxLua/build/msw makefile.bcc,1.1,1.2 makefile.gcc,1.1,1.2 makefile.vc,1.1,1.2 makefile.wat,1.1,1.2

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

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

Modified Files:
	makefile.bcc makefile.gcc makefile.vc makefile.wat 
Log Message:
Added bakefile build system

Index: makefile.vc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makefile.vc	12 Jun 2005 18:29:20 -0000	1.1
--- makefile.vc	12 Jun 2005 21:21:09 -0000	1.2
***************
*** 11,35 ****
  # -------------------------------------------------------------------------
  
- # C compiler 
- CC = cl
- 
- # C++ compiler 
- CXX = cl
- 
- # Standard flags for CC 
- CFLAGS = 
- 
- # Standard flags for C++ 
- CXXFLAGS = 
- 
- # Standard preprocessor flags (common for CC and CXX) 
- CPPFLAGS = 
- 
- # Standard linker flags 
- LDFLAGS = 
- 
- # The directory where wxWidgets library is installed 
- WX_DIR = $(WXWIN)
- 
  # Use DLL build of wx library to use? [0,1]
  WX_SHARED = 0
--- 11,14 ----
***************
*** 41,113 ****
  WX_DEBUG = 1
  
- # Version of the wx library to build against. 
- WX_VERSION = 26
- 
- # Does the FREETYPE support need to be compiled ? [0,1]
- WXART2D_USE_FREETYPE = 1
- 
- # Does the EXPAT support need to be compiled ? [0,1]
- WXART2D_USE_EXPAT = 1
- 
- # Does the LUA support need to be compiled ? [0,1]
- WXART2D_USE_LUA = 0
- 
- # Does the AGG support need to be compiled ? [0,1]
- WXART2D_USE_AGG = 1
- 
- # Does the samples need to be compiled ? [0,1]
- SAMPLES = 1
- 
- # Does the CVG support need to be compiled ? [0,1]
- WXART2D_USE_CVGIO = 1
- 
- # Does AGGDRAWER module need to be compiled ? [0,1]
- WXART2D_USE_AGGDRAWER = 1
- 
- # Does ARTBAES module need to be compiled ? [0,1]
- WXART2D_USE_ARTBASE = 1
- 
- # Does CANEXTOBJ module need to be compiled ? [0,1]
- WXART2D_USE_CANEXTOBJ = 1
- 
- # Does CANVAS module need to be compiled ? [0,1]
- WXART2D_USE_CANVAS = 1
- 
- # Does CURVES module need to be compiled ? [0,1]
- WXART2D_USE_CURVES = 1
- 
- # Does DOCVIEW module need to be compiled ? [0,1]
- WXART2D_USE_DOCVIEW = 1
- 
- # Does EDITOR module need to be compiled ? [0,1]
- WXART2D_USE_EDITOR = 1
- 
- # Does GDSIO module need to be compiled ? [0,1]
- WXART2D_USE_GDSIO = 1
- 
- # Does KBOOL module need to be compiled ? [0,1]
- WXART2D_USE_KBOOL = 1
- 
- # Does KEYIO module need to be compiled ? [0,1]
- WXART2D_USE_KEYIO = 1
- 
- # Does LUAWRAPS module need to be compiled ? [0,1]
- WXART2D_USE_LUAWRAPS = 0
- 
- # Does STSL module need to be compiled ? [0,1]
- WXART2D_USE_STSL = 1
- 
- # Does SVGIO module need to be compiled ? [0,1]
- WXART2D_USE_SVGIO = 1
- 
- # Does XMLPARSE module need to be compiled ? [0,1]
- WXART2D_USE_XMLPARSE = 1
- 
- # Does the Mars application needs to be compiled ? [0,1]
- MARS = 1
- 
- # Does the Teto application needs to be compiled ? [0,1]
- TETO = 1
- 
  
  
--- 20,23 ----
***************
*** 121,233 ****
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
! 	WX_VERSION="$(WX_VERSION)" WXART2D_USE_FREETYPE="$(WXART2D_USE_FREETYPE)" \
! 	WXART2D_USE_EXPAT="$(WXART2D_USE_EXPAT)" \
! 	WXART2D_USE_LUA="$(WXART2D_USE_LUA)" WXART2D_USE_AGG="$(WXART2D_USE_AGG)" \
! 	BUILD="$(BUILD_EQUIVALENT)" SAMPLES="$(SAMPLES)" \
! 	WXART2D_USE_CVGIO="$(WXART2D_USE_CVGIO)" \
! 	WXART2D_USE_AGGDRAWER="$(WXART2D_USE_AGGDRAWER)" \
! 	WXART2D_USE_ARTBASE="$(WXART2D_USE_ARTBASE)" \
! 	WXART2D_USE_CANEXTOBJ="$(WXART2D_USE_CANEXTOBJ)" \
! 	WXART2D_USE_CANVAS="$(WXART2D_USE_CANVAS)" \
! 	WXART2D_USE_CURVES="$(WXART2D_USE_CURVES)" \
! 	WXART2D_USE_DOCVIEW="$(WXART2D_USE_DOCVIEW)" \
! 	WXART2D_USE_EDITOR="$(WXART2D_USE_EDITOR)" \
! 	WXART2D_USE_GDSIO="$(WXART2D_USE_GDSIO)" \
! 	WXART2D_USE_KBOOL="$(WXART2D_USE_KBOOL)" \
! 	WXART2D_USE_KEYIO="$(WXART2D_USE_KEYIO)" \
! 	WXART2D_USE_LUAWRAPS="$(WXART2D_USE_LUAWRAPS)" \
! 	WXART2D_USE_STSL="$(WXART2D_USE_STSL)" \
! 	WXART2D_USE_SVGIO="$(WXART2D_USE_SVGIO)" \
! 	WXART2D_USE_XMLPARSE="$(WXART2D_USE_XMLPARSE)" MARS="$(MARS)" \
! 	TETO="$(TETO)"
  
  ### Conditionally set variables: ###
  
- !if "$(WXART2D_USE_AGGDRAWER)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = /DA2DAGGDRAWERMAKINGDLL
- !endif
- !if "$(WXART2D_USE_ARTBASE)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DARTBASEMAKINGDLL
- !endif
- !if "$(WXART2D_USE_CANEXTOBJ)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DCANEXTOBJMAKINGDLL
- !endif
- !if "$(WXART2D_USE_CANVAS)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DCANVASMAKINGDLL
- !endif
- !if "$(WXART2D_USE_CURVES)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DCURVESMAKINGDLL
- !endif
- !if "$(WXART2D_USE_DOCVIEW)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DDOCVIEWMAKINGDLL
- !endif
- !if "$(WXART2D_USE_EDITOR)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DEDITORMAKINGDLL
- !endif
- !if "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DGENERALMAKINGDLL
- !endif
- !if "$(WXART2D_USE_GDSIO)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DGDSIOMAKINGDLL
- !endif
- !if "$(WXART2D_USE_KBOOL)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DKBOOLMAKINGDLL
- !endif
- !if "$(WXART2D_USE_KEYIO)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DKEYIOMAKINGDLL
- !endif
- !if "$(WXART2D_USE_LUAWRAPS)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DLUAWRAPSMAKINGDLL
- !endif
- !if "$(WXART2D_USE_STSL)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DSTSLMAKINGDLL
- !endif
- !if "$(WXART2D_USE_SVGIO)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DSVGIOMAKINGDLL
- !endif
- !if "$(WXART2D_USE_XMLPARSE)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) /DA2DXMLPARSEMAKINGDLL
- !endif
- !if "$(WXART2D_USE_AGG)" == "1"
- THIRDPARTY_INCLUDE_PATH = /I..\..\thirdparty\agg2\include
- !endif
- !if "$(WXART2D_USE_EXPAT)" == "1"
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \
- 	/I..\..\thirdparty\expat\include
- !endif
- !if "$(WXART2D_USE_FREETYPE)" == "1"
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \
- 	/I..\..\thirdparty\freetype\include
- !endif
- !if "$(WXART2D_USE_LUA)" == "1"
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \
- 	/I..\..\thirdparty\wxLua\include
- !endif
- !if "$(WXART2D_USE_AGG)" == "1"
- THIRDPARTY_LIB_PATH = /LIBPATH:..\..\thirdparty\agg2\lib
- !endif
- !if "$(WXART2D_USE_EXPAT)" == "1"
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) \
- 	/LIBPATH:..\..\thirdparty\expat\lib
- !endif
- !if "$(WXART2D_USE_FREETYPE)" == "1"
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) \
- 	/LIBPATH:..\..\thirdparty\freetype\lib
- !endif
- !if "$(WXART2D_USE_LUA)" == "1"
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) \
- 	/LIBPATH:..\..\thirdparty\wxLua\lib
- !endif
- !if "$(WX_DEBUG)" == "1"
- BUILD_EQUIVALENT = debug
- !endif
- !if "$(WX_DEBUG)" == "1"
- BUILD_EQUIVALENT = release
- !endif
  
  
  ### Targets: ###
  
! all: sub_thirdyparty sub_modules sub_apps
  
  clean: 
--- 31,44 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
! 	WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)"
  
  ### Conditionally set variables: ###
  
  
  
  ### Targets: ###
  
! all: utils modules apps
  
  clean: 
***************
*** 235,239 ****
  	-if exist .\*.res del .\*.res
  	-if exist .\*.pch del .\*.pch
! 	cd ..\..\thirdparty\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS) clean
  	cd $(MAKEDIR)
--- 46,50 ----
  	-if exist .\*.res del .\*.res
  	-if exist .\*.pch del .\*.pch
! 	cd ..\..\utils\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS) clean
  	cd $(MAKEDIR)
***************
*** 245,268 ****
  	cd $(MAKEDIR)
  
! sub_thirdyparty: 
! 	cd ..\..\thirdparty\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS)
  	cd $(MAKEDIR)
  
! sub_modules: 
  	cd ..\..\modules\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS)
  	cd $(MAKEDIR)
  
! sub_apps: 
  	cd ..\..\apps\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS)
  	cd $(MAKEDIR)
  
- docs: 
- 	@echo =============================================
- 	@echo Creating wxArt2d docs using doxygen...
- 	@echo =============================================
- 	cd ..\..\doc
- 	doxygen doxygen.inc
- 
--- 56,72 ----
  	cd $(MAKEDIR)
  
! utils: 
! 	cd ..\..\utils\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS)
  	cd $(MAKEDIR)
  
! modules: 
  	cd ..\..\modules\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS)
  	cd $(MAKEDIR)
  
! apps: 
  	cd ..\..\apps\build\msw
  	$(MAKE) -f makefile.vc $(MAKEARGS)
  	cd $(MAKEDIR)
  

Index: makefile.bcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makefile.bcc	12 Jun 2005 18:29:20 -0000	1.1
--- makefile.bcc	12 Jun 2005 21:21:09 -0000	1.2
***************
*** 75,186 ****
  !endif
  
! # Does the FREETYPE support need to be compiled ? [0,1]
! !ifndef WXART2D_USE_FREETYPE
! WXART2D_USE_FREETYPE = 1
! !endif
! 
! # Does the EXPAT support need to be compiled ? [0,1]
! !ifndef WXART2D_USE_EXPAT
! WXART2D_USE_EXPAT = 1
! !endif
! 
! # Does the LUA support need to be compiled ? [0,1]
! !ifndef WXART2D_USE_LUA
! WXART2D_USE_LUA = 0
! !endif
! 
! # Does the AGG support need to be compiled ? [0,1]
! !ifndef WXART2D_USE_AGG
! WXART2D_USE_AGG = 1
! !endif
! 
! # Does the samples need to be compiled ? [0,1]
! !ifndef SAMPLES
! SAMPLES = 1
! !endif
! 
! # Does the CVG support need to be compiled ? [0,1]
! !ifndef WXART2D_USE_CVGIO
! WXART2D_USE_CVGIO = 1
! !endif
! 
! # Does AGGDRAWER module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_AGGDRAWER
! WXART2D_USE_AGGDRAWER = 1
! !endif
! 
! # Does ARTBAES module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_ARTBASE
! WXART2D_USE_ARTBASE = 1
! !endif
! 
! # Does CANEXTOBJ module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_CANEXTOBJ
! WXART2D_USE_CANEXTOBJ = 1
! !endif
! 
! # Does CANVAS module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_CANVAS
! WXART2D_USE_CANVAS = 1
! !endif
! 
! # Does CURVES module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_CURVES
! WXART2D_USE_CURVES = 1
! !endif
! 
! # Does DOCVIEW module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_DOCVIEW
! WXART2D_USE_DOCVIEW = 1
! !endif
! 
! # Does EDITOR module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_EDITOR
! WXART2D_USE_EDITOR = 1
! !endif
! 
! # Does GDSIO module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_GDSIO
! WXART2D_USE_GDSIO = 1
! !endif
! 
! # Does KBOOL module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_KBOOL
! WXART2D_USE_KBOOL = 1
! !endif
! 
! # Does KEYIO module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_KEYIO
! WXART2D_USE_KEYIO = 1
! !endif
! 
! # Does LUAWRAPS module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_LUAWRAPS
! WXART2D_USE_LUAWRAPS = 0
! !endif
! 
! # Does STSL module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_STSL
! WXART2D_USE_STSL = 1
! !endif
! 
! # Does SVGIO module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_SVGIO
! WXART2D_USE_SVGIO = 1
! !endif
! 
! # Does XMLPARSE module need to be compiled ? [0,1]
! !ifndef WXART2D_USE_XMLPARSE
! WXART2D_USE_XMLPARSE = 1
  !endif
  
! # Does the Mars application needs to be compiled ? [0,1]
! !ifndef MARS
! MARS = 1
  !endif
  
! # Does the Teto application needs to be compiled ? [0,1]
! !ifndef TETO
! TETO = 1
  !endif
  
--- 75,91 ----
  !endif
  
! # Does the wxLua utilities shoulb be compiled ? [0,1]
! !ifndef USE_UTIL
! USE_UTIL = 1
  !endif
  
! # Does the wxLua debug support need to be compiled ? [0,1]
! !ifndef USE_WXLUADEBUG
! USE_WXLUADEBUG = 1
  !endif
  
! # Does the wxLua socket support need to be compiled ? [0,1]
! !ifndef USE_WXLUASOCKET
! USE_WXLUASOCKET = 1
  !endif
  
***************
*** 197,307 ****
  	-DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \
  	-DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \
! 	-DWX_VERSION="$(WX_VERSION)" \
! 	-DWXART2D_USE_FREETYPE="$(WXART2D_USE_FREETYPE)" \
! 	-DWXART2D_USE_EXPAT="$(WXART2D_USE_EXPAT)" \
! 	-DWXART2D_USE_LUA="$(WXART2D_USE_LUA)" \
! 	-DWXART2D_USE_AGG="$(WXART2D_USE_AGG)" -DBUILD="$(BUILD_EQUIVALENT)" \
! 	-DSAMPLES="$(SAMPLES)" -DWXART2D_USE_CVGIO="$(WXART2D_USE_CVGIO)" \
! 	-DWXART2D_USE_AGGDRAWER="$(WXART2D_USE_AGGDRAWER)" \
! 	-DWXART2D_USE_ARTBASE="$(WXART2D_USE_ARTBASE)" \
! 	-DWXART2D_USE_CANEXTOBJ="$(WXART2D_USE_CANEXTOBJ)" \
! 	-DWXART2D_USE_CANVAS="$(WXART2D_USE_CANVAS)" \
! 	-DWXART2D_USE_CURVES="$(WXART2D_USE_CURVES)" \
! 	-DWXART2D_USE_DOCVIEW="$(WXART2D_USE_DOCVIEW)" \
! 	-DWXART2D_USE_EDITOR="$(WXART2D_USE_EDITOR)" \
! 	-DWXART2D_USE_GDSIO="$(WXART2D_USE_GDSIO)" \
! 	-DWXART2D_USE_KBOOL="$(WXART2D_USE_KBOOL)" \
! 	-DWXART2D_USE_KEYIO="$(WXART2D_USE_KEYIO)" \
! 	-DWXART2D_USE_LUAWRAPS="$(WXART2D_USE_LUAWRAPS)" \
! 	-DWXART2D_USE_STSL="$(WXART2D_USE_STSL)" \
! 	-DWXART2D_USE_SVGIO="$(WXART2D_USE_SVGIO)" \
! 	-DWXART2D_USE_XMLPARSE="$(WXART2D_USE_XMLPARSE)" -DMARS="$(MARS)" \
! 	-DTETO="$(TETO)"
  
  ### Conditionally set variables: ###
  
- !if "$(WXART2D_USE_AGGDRAWER)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = -DA2DAGGDRAWERMAKINGDLL
- !endif
- !if "$(WXART2D_USE_ARTBASE)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DARTBASEMAKINGDLL
- !endif
- !if "$(WXART2D_USE_CANEXTOBJ)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCANEXTOBJMAKINGDLL
- !endif
- !if "$(WXART2D_USE_CANVAS)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCANVASMAKINGDLL
- !endif
- !if "$(WXART2D_USE_CURVES)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCURVESMAKINGDLL
- !endif
- !if "$(WXART2D_USE_DOCVIEW)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DDOCVIEWMAKINGDLL
- !endif
- !if "$(WXART2D_USE_EDITOR)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DEDITORMAKINGDLL
- !endif
- !if "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DGENERALMAKINGDLL
- !endif
- !if "$(WXART2D_USE_GDSIO)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DGDSIOMAKINGDLL
- !endif
- !if "$(WXART2D_USE_KBOOL)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DKBOOLMAKINGDLL
- !endif
- !if "$(WXART2D_USE_KEYIO)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DKEYIOMAKINGDLL
- !endif
- !if "$(WXART2D_USE_LUAWRAPS)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DLUAWRAPSMAKINGDLL
- !endif
- !if "$(WXART2D_USE_STSL)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DSTSLMAKINGDLL
- !endif
- !if "$(WXART2D_USE_SVGIO)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DSVGIOMAKINGDLL
- !endif
- !if "$(WXART2D_USE_XMLPARSE)" == "1" && "$(WX_SHARED)" == "1"
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DXMLPARSEMAKINGDLL
- !endif
- !if "$(WXART2D_USE_AGG)" == "1"
- THIRDPARTY_INCLUDE_PATH = -I..\..\thirdparty\agg2\include
- !endif
- !if "$(WXART2D_USE_EXPAT)" == "1"
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \
- 	-I..\..\thirdparty\expat\include
- !endif
- !if "$(WXART2D_USE_FREETYPE)" == "1"
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \
- 	-I..\..\thirdparty\freetype\include
- !endif
- !if "$(WXART2D_USE_LUA)" == "1"
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \
- 	-I..\..\thirdparty\wxLua\include
- !endif
- !if "$(WXART2D_USE_AGG)" == "1"
- THIRDPARTY_LIB_PATH = -L..\..\thirdparty\agg2\lib
- !endif
- !if "$(WXART2D_USE_EXPAT)" == "1"
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\expat\lib
- !endif
- !if "$(WXART2D_USE_FREETYPE)" == "1"
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\freetype\lib
- !endif
- !if "$(WXART2D_USE_LUA)" == "1"
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\wxLua\lib
- !endif
- !if "$(WX_DEBUG)" == "1"
- BUILD_EQUIVALENT = debug
- !endif
- !if "$(WX_DEBUG)" == "1"
- BUILD_EQUIVALENT = release
- !endif
  
  
  ### Targets: ###
  
! all: thirdyparty modules apps
  
  clean: 
--- 102,116 ----
  	-DWX_DIR="$(WX_DIR)" -DWX_SHARED="$(WX_SHARED)" \
  	-DWX_UNICODE="$(WX_UNICODE)" -DWX_DEBUG="$(WX_DEBUG)" \
! 	-DWX_VERSION="$(WX_VERSION)" -DUSE_UTIL="$(USE_UTIL)" \
! 	-DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \
! 	-DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)"
  
  ### Conditionally set variables: ###
  
  
  
  ### Targets: ###
  
! all: utils modules apps
  
  clean: 
***************
*** 309,316 ****
  	-if exist .\*.res del .\*.res
  	-if exist .\*.csm del .\*.csm
! 	@echo cd ..\..\thirdparty\build\msw >thirdyparty.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>thirdyparty.bat
! 	call thirdyparty.bat
! 	@del thirdyparty.bat
  	@echo cd ..\..\modules\build\msw >modules.bat
  	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>modules.bat
--- 118,125 ----
  	-if exist .\*.res del .\*.res
  	-if exist .\*.csm del .\*.csm
! 	@echo cd ..\..\utils\build\msw >utils.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>utils.bat
! 	call utils.bat
! 	@del utils.bat
  	@echo cd ..\..\modules\build\msw >modules.bat
  	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>modules.bat
***************
*** 322,330 ****
  	@del apps.bat
  
! thirdyparty: 
! 	@echo cd ..\..\thirdparty\build\msw >thirdyparty.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS)  >>thirdyparty.bat
! 	call thirdyparty.bat
! 	@del thirdyparty.bat
  
  modules: 
--- 131,139 ----
  	@del apps.bat
  
! utils: 
! 	@echo cd ..\..\utils\build\msw >utils.bat
! 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS)  >>utils.bat
! 	call utils.bat
! 	@del utils.bat
  
  modules: 
***************
*** 340,348 ****
  	@del apps.bat
  
- docs: 
- 	@echo =============================================
- 	@echo Creating wxArt2d docs using doxygen...
- 	@echo =============================================
- 	cd ..\..\doc
- 	doxygen doxygen.inc
- 
--- 149,150 ----

Index: makefile.wat
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makefile.wat	12 Jun 2005 18:29:20 -0000	1.1
--- makefile.wat	12 Jun 2005 21:21:09 -0000	1.2
***************
*** 11,35 ****
  # -------------------------------------------------------------------------
  
- # C compiler 
- CC = wcc386
- 
- # C++ compiler 
- CXX = wpp386
- 
- # Standard flags for CC 
- CFLAGS = 
- 
- # Standard flags for C++ 
- CXXFLAGS = 
- 
- # Standard preprocessor flags (common for CC and CXX) 
- CPPFLAGS = 
- 
- # Standard linker flags 
- LDFLAGS = 
- 
- # The directory where wxWidgets library is installed 
- WX_DIR = $(%WXWIN)
- 
  # Use DLL build of wx library to use? [0,1]
  WX_SHARED = 0
--- 11,14 ----
***************
*** 41,113 ****
  WX_DEBUG = 1
  
- # Version of the wx library to build against. 
- WX_VERSION = 26
- 
- # Does the FREETYPE support need to be compiled ? [0,1]
- WXART2D_USE_FREETYPE = 1
- 
- # Does the EXPAT support need to be compiled ? [0,1]
- WXART2D_USE_EXPAT = 1
- 
- # Does the LUA support need to be compiled ? [0,1]
- WXART2D_USE_LUA = 0
- 
- # Does the AGG support need to be compiled ? [0,1]
- WXART2D_USE_AGG = 1
- 
- # Does the samples need to be compiled ? [0,1]
- SAMPLES = 1
- 
- # Does the CVG support need to be compiled ? [0,1]
- WXART2D_USE_CVGIO = 1
- 
- # Does AGGDRAWER module need to be compiled ? [0,1]
- WXART2D_USE_AGGDRAWER = 1
- 
- # Does ARTBAES module need to be compiled ? [0,1]
- WXART2D_USE_ARTBASE = 1
- 
- # Does CANEXTOBJ module need to be compiled ? [0,1]
- WXART2D_USE_CANEXTOBJ = 1
- 
- # Does CANVAS module need to be compiled ? [0,1]
- WXART2D_USE_CANVAS = 1
- 
- # Does CURVES module need to be compiled ? [0,1]
- WXART2D_USE_CURVES = 1
- 
- # Does DOCVIEW module need to be compiled ? [0,1]
- WXART2D_USE_DOCVIEW = 1
- 
- # Does EDITOR module need to be compiled ? [0,1]
- WXART2D_USE_EDITOR = 1
- 
- # Does GDSIO module need to be compiled ? [0,1]
- WXART2D_USE_GDSIO = 1
- 
- # Does KBOOL module need to be compiled ? [0,1]
- WXART2D_USE_KBOOL = 1
- 
- # Does KEYIO module need to be compiled ? [0,1]
- WXART2D_USE_KEYIO = 1
- 
- # Does LUAWRAPS module need to be compiled ? [0,1]
- WXART2D_USE_LUAWRAPS = 0
- 
- # Does STSL module need to be compiled ? [0,1]
- WXART2D_USE_STSL = 1
- 
- # Does SVGIO module need to be compiled ? [0,1]
- WXART2D_USE_SVGIO = 1
- 
- # Does XMLPARSE module need to be compiled ? [0,1]
- WXART2D_USE_XMLPARSE = 1
- 
- # Does the Mars application needs to be compiled ? [0,1]
- MARS = 1
- 
- # Does the Teto application needs to be compiled ? [0,1]
- TETO = 1
- 
  
  
--- 20,23 ----
***************
*** 133,249 ****
  ### Conditionally set variables: ###
  
- SHARED_DEFINES =
- !ifeq WXART2D_USE_AGGDRAWER 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = -dA2DAGGDRAWERMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_ARTBASE 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DARTBASEMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_CANEXTOBJ 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DCANEXTOBJMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_CANVAS 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DCANVASMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_CURVES 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DCURVESMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_DOCVIEW 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DDOCVIEWMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_EDITOR 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DEDITORMAKINGDLL
- !endif
- !endif
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DGENERALMAKINGDLL
- !endif
- !ifeq WXART2D_USE_GDSIO 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DGDSIOMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_KBOOL 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DKBOOLMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_KEYIO 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DKEYIOMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_LUAWRAPS 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DLUAWRAPSMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_STSL 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DSTSLMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_SVGIO 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DSVGIOMAKINGDLL
- !endif
- !endif
- !ifeq WXART2D_USE_XMLPARSE 1
- !ifeq WX_SHARED 1
- SHARED_DEFINES = $(SHARED_DEFINES) -dA2DXMLPARSEMAKINGDLL
- !endif
- !endif
- THIRDPARTY_INCLUDE_PATH =
- !ifeq WXART2D_USE_AGG 1
- THIRDPARTY_INCLUDE_PATH = -i=..\..\thirdparty\agg2\include
- !endif
- !ifeq WXART2D_USE_EXPAT 1
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) &
- 	-i=..\..\thirdparty\expat\include
- !endif
- !ifeq WXART2D_USE_FREETYPE 1
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) &
- 	-i=..\..\thirdparty\freetype\include
- !endif
- !ifeq WXART2D_USE_LUA 1
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) &
- 	-i=..\..\thirdparty\wxLua\include
- !endif
- THIRDPARTY_LIB_PATH =
- !ifeq WXART2D_USE_AGG 1
- THIRDPARTY_LIB_PATH = libpath ..\..\thirdparty\agg2\lib
- !endif
- !ifeq WXART2D_USE_EXPAT 1
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) libpath &
- 	..\..\thirdparty\expat\lib
- !endif
- !ifeq WXART2D_USE_FREETYPE 1
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) libpath &
- 	..\..\thirdparty\freetype\lib
- !endif
- !ifeq WXART2D_USE_LUA 1
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) libpath &
- 	..\..\thirdparty\wxLua\lib
- !endif
- BUILD_EQUIVALENT =
- !ifeq WX_DEBUG 1
- BUILD_EQUIVALENT = debug
- !endif
- !ifeq WX_DEBUG 1
- BUILD_EQUIVALENT = release
- !endif
  
  ### Variables: ###
--- 43,46 ----
***************
*** 252,280 ****
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" &
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" &
! 	WX_VERSION="$(WX_VERSION)" WXART2D_USE_FREETYPE="$(WXART2D_USE_FREETYPE)" &
! 	WXART2D_USE_EXPAT="$(WXART2D_USE_EXPAT)" &
! 	WXART2D_USE_LUA="$(WXART2D_USE_LUA)" WXART2D_USE_AGG="$(WXART2D_USE_AGG)" &
! 	BUILD="$(BUILD_EQUIVALENT)" SAMPLES="$(SAMPLES)" &
! 	WXART2D_USE_CVGIO="$(WXART2D_USE_CVGIO)" &
! 	WXART2D_USE_AGGDRAWER="$(WXART2D_USE_AGGDRAWER)" &
! 	WXART2D_USE_ARTBASE="$(WXART2D_USE_ARTBASE)" &
! 	WXART2D_USE_CANEXTOBJ="$(WXART2D_USE_CANEXTOBJ)" &
! 	WXART2D_USE_CANVAS="$(WXART2D_USE_CANVAS)" &
! 	WXART2D_USE_CURVES="$(WXART2D_USE_CURVES)" &
! 	WXART2D_USE_DOCVIEW="$(WXART2D_USE_DOCVIEW)" &
! 	WXART2D_USE_EDITOR="$(WXART2D_USE_EDITOR)" &
! 	WXART2D_USE_GDSIO="$(WXART2D_USE_GDSIO)" &
! 	WXART2D_USE_KBOOL="$(WXART2D_USE_KBOOL)" &
! 	WXART2D_USE_KEYIO="$(WXART2D_USE_KEYIO)" &
! 	WXART2D_USE_LUAWRAPS="$(WXART2D_USE_LUAWRAPS)" &
! 	WXART2D_USE_STSL="$(WXART2D_USE_STSL)" &
! 	WXART2D_USE_SVGIO="$(WXART2D_USE_SVGIO)" &
! 	WXART2D_USE_XMLPARSE="$(WXART2D_USE_XMLPARSE)" MARS="$(MARS)" &
! 	TETO="$(TETO)"
  
  
  ### Targets: ###
  
! all : .SYMBOLIC thirdyparty modules apps
  
  clean : .SYMBOLIC 
--- 49,59 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" &
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" &
! 	WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" &
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)"
  
  
  ### Targets: ###
  
! all : .SYMBOLIC utils modules apps
  
  clean : .SYMBOLIC 
***************
*** 284,288 ****
  	-if exist .\*.ilk del .\*.ilk
  	-if exist .\*.pch del .\*.pch
! 	cd ..\..\thirdparty\build\msw
  	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
  	cd $(WATCOM_CWD)
--- 63,67 ----
  	-if exist .\*.ilk del .\*.ilk
  	-if exist .\*.pch del .\*.pch
! 	cd ..\..\utils\build\msw
  	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
  	cd $(WATCOM_CWD)
***************
*** 294,299 ****
  	cd $(WATCOM_CWD)
  
! thirdyparty : .SYMBOLIC 
! 	cd ..\..\thirdparty\build\msw
  	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS)
  	cd $(WATCOM_CWD)
--- 73,78 ----
  	cd $(WATCOM_CWD)
  
! utils : .SYMBOLIC 
! 	cd ..\..\utils\build\msw
  	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS)
  	cd $(WATCOM_CWD)
***************
*** 309,317 ****
  	cd $(WATCOM_CWD)
  
- docs :  
- 	@echo =============================================
- 	@echo Creating wxArt2d docs using doxygen...
- 	@echo =============================================
- 	cd ..\..\doc
- 	doxygen doxygen.inc
- 
--- 88,89 ----

Index: makefile.gcc
===================================================================
RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** makefile.gcc	12 Jun 2005 18:29:20 -0000	1.1
--- makefile.gcc	12 Jun 2005 21:21:09 -0000	1.2
***************
*** 11,35 ****
  # -------------------------------------------------------------------------
  
- # C compiler 
- CC = gcc
- 
- # C++ compiler 
- CXX = g++
- 
- # Standard flags for CC 
- CFLAGS = 
- 
- # Standard flags for C++ 
- CXXFLAGS = 
- 
- # Standard preprocessor flags (common for CC and CXX) 
- CPPFLAGS = 
- 
- # Standard linker flags 
- LDFLAGS = 
- 
- # The directory where wxWidgets library is installed 
- WX_DIR = $(WXWIN)
- 
  # Use DLL build of wx library to use? [0,1]
  WX_SHARED = 0
--- 11,14 ----
***************
*** 41,113 ****
  WX_DEBUG = 1
  
- # Version of the wx library to build against. 
- WX_VERSION = 26
- 
- # Does the FREETYPE support need to be compiled ? [0,1]
- WXART2D_USE_FREETYPE = 1
- 
- # Does the EXPAT support need to be compiled ? [0,1]
- WXART2D_USE_EXPAT = 1
- 
- # Does the LUA support need to be compiled ? [0,1]
- WXART2D_USE_LUA = 0
- 
- # Does the AGG support need to be compiled ? [0,1]
- WXART2D_USE_AGG = 1
- 
- # Does the samples need to be compiled ? [0,1]
- SAMPLES = 1
- 
- # Does the CVG support need to be compiled ? [0,1]
- WXART2D_USE_CVGIO = 1
- 
- # Does AGGDRAWER module need to be compiled ? [0,1]
- WXART2D_USE_AGGDRAWER = 1
- 
- # Does ARTBAES module need to be compiled ? [0,1]
- WXART2D_USE_ARTBASE = 1
- 
- # Does CANEXTOBJ module need to be compiled ? [0,1]
- WXART2D_USE_CANEXTOBJ = 1
- 
- # Does CANVAS module need to be compiled ? [0,1]
- WXART2D_USE_CANVAS = 1
- 
- # Does CURVES module need to be compiled ? [0,1]
- WXART2D_USE_CURVES = 1
- 
- # Does DOCVIEW module need to be compiled ? [0,1]
- WXART2D_USE_DOCVIEW = 1
- 
- # Does EDITOR module need to be compiled ? [0,1]
- WXART2D_USE_EDITOR = 1
- 
- # Does GDSIO module need to be compiled ? [0,1]
- WXART2D_USE_GDSIO = 1
- 
- # Does KBOOL module need to be compiled ? [0,1]
- WXART2D_USE_KBOOL = 1
- 
- # Does KEYIO module need to be compiled ? [0,1]
- WXART2D_USE_KEYIO = 1
- 
- # Does LUAWRAPS module need to be compiled ? [0,1]
- WXART2D_USE_LUAWRAPS = 0
- 
- # Does STSL module need to be compiled ? [0,1]
- WXART2D_USE_STSL = 1
- 
- # Does SVGIO module need to be compiled ? [0,1]
- WXART2D_USE_SVGIO = 1
- 
- # Does XMLPARSE module need to be compiled ? [0,1]
- WXART2D_USE_XMLPARSE = 1
- 
- # Does the Mars application needs to be compiled ? [0,1]
- MARS = 1
- 
- # Does the Teto application needs to be compiled ? [0,1]
- TETO = 1
- 
  
  
--- 20,23 ----
***************
*** 121,267 ****
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
! 	WX_VERSION="$(WX_VERSION)" WXART2D_USE_FREETYPE="$(WXART2D_USE_FREETYPE)" \
! 	WXART2D_USE_EXPAT="$(WXART2D_USE_EXPAT)" \
! 	WXART2D_USE_LUA="$(WXART2D_USE_LUA)" WXART2D_USE_AGG="$(WXART2D_USE_AGG)" \
! 	BUILD="$(BUILD_EQUIVALENT)" SAMPLES="$(SAMPLES)" \
! 	WXART2D_USE_CVGIO="$(WXART2D_USE_CVGIO)" \
! 	WXART2D_USE_AGGDRAWER="$(WXART2D_USE_AGGDRAWER)" \
! 	WXART2D_USE_ARTBASE="$(WXART2D_USE_ARTBASE)" \
! 	WXART2D_USE_CANEXTOBJ="$(WXART2D_USE_CANEXTOBJ)" \
! 	WXART2D_USE_CANVAS="$(WXART2D_USE_CANVAS)" \
! 	WXART2D_USE_CURVES="$(WXART2D_USE_CURVES)" \
! 	WXART2D_USE_DOCVIEW="$(WXART2D_USE_DOCVIEW)" \
! 	WXART2D_USE_EDITOR="$(WXART2D_USE_EDITOR)" \
! 	WXART2D_USE_GDSIO="$(WXART2D_USE_GDSIO)" \
! 	WXART2D_USE_KBOOL="$(WXART2D_USE_KBOOL)" \
! 	WXART2D_USE_KEYIO="$(WXART2D_USE_KEYIO)" \
! 	WXART2D_USE_LUAWRAPS="$(WXART2D_USE_LUAWRAPS)" \
! 	WXART2D_USE_STSL="$(WXART2D_USE_STSL)" \
! 	WXART2D_USE_SVGIO="$(WXART2D_USE_SVGIO)" \
! 	WXART2D_USE_XMLPARSE="$(WXART2D_USE_XMLPARSE)" MARS="$(MARS)" \
! 	TETO="$(TETO)"
  
  ### Conditionally set variables: ###
  
- ifeq ($(WXART2D_USE_AGGDRAWER),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = -DA2DAGGDRAWERMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_ARTBASE),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DARTBASEMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_CANEXTOBJ),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCANEXTOBJMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_CANVAS),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCANVASMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_CURVES),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DCURVESMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_DOCVIEW),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DDOCVIEWMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_EDITOR),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DEDITORMAKINGDLL
- endif
- endif
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DGENERALMAKINGDLL
- endif
- ifeq ($(WXART2D_USE_GDSIO),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DGDSIOMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_KBOOL),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DKBOOLMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_KEYIO),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DKEYIOMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_LUAWRAPS),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DLUAWRAPSMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_STSL),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DSTSLMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_SVGIO),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DSVGIOMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_XMLPARSE),1)
- ifeq ($(WX_SHARED),1)
- SHARED_DEFINES = $(SHARED_DEFINES) -DA2DXMLPARSEMAKINGDLL
- endif
- endif
- ifeq ($(WXART2D_USE_AGG),1)
- THIRDPARTY_INCLUDE_PATH = -I..\..\thirdparty\agg2\include
- endif
- ifeq ($(WXART2D_USE_EXPAT),1)
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \
- 	-I..\..\thirdparty\expat\include
- endif
- ifeq ($(WXART2D_USE_FREETYPE),1)
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \
- 	-I..\..\thirdparty\freetype\include
- endif
- ifeq ($(WXART2D_USE_LUA),1)
- THIRDPARTY_INCLUDE_PATH = $(THIRDPARTY_INCLUDE_PATH) \
- 	-I..\..\thirdparty\wxLua\include
- endif
- ifeq ($(WXART2D_USE_AGG),1)
- THIRDPARTY_LIB_PATH = -L..\..\thirdparty\agg2\lib
- endif
- ifeq ($(WXART2D_USE_EXPAT),1)
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\expat\lib
- endif
- ifeq ($(WXART2D_USE_FREETYPE),1)
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\freetype\lib
- endif
- ifeq ($(WXART2D_USE_LUA),1)
- THIRDPARTY_LIB_PATH = $(THIRDPARTY_LIB_PATH) -L..\..\thirdparty\wxLua\lib
- endif
- ifeq ($(WX_DEBUG),1)
- BUILD_EQUIVALENT = debug
- endif
- ifeq ($(WX_DEBUG),1)
- BUILD_EQUIVALENT = release
- endif
  
  
  ### Targets: ###
  
! all: thirdyparty modules apps
  
  clean: 
  	-if exist .\*.o del .\*.o
! 	$(MAKE) -C ..\..\thirdparty\build\msw -f makefile.gcc $(MAKEARGS) clean
  	$(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean
  	$(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean
  
! thirdyparty: 
! 	$(MAKE) -C ..\..\thirdparty\build\msw -f makefile.gcc $(MAKEARGS)
  
  modules: 
--- 31,53 ----
  	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" WX_DIR="$(WX_DIR)" \
  	WX_SHARED="$(WX_SHARED)" WX_UNICODE="$(WX_UNICODE)" WX_DEBUG="$(WX_DEBUG)" \
! 	WX_VERSION="$(WX_VERSION)" USE_UTIL="$(USE_UTIL)" \
! 	USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)"
  
  ### Conditionally set variables: ###
  
  
  
  ### Targets: ###
  
! all: utils modules apps
  
  clean: 
  	-if exist .\*.o del .\*.o
! 	$(MAKE) -C ..\..\utils\build\msw -f makefile.gcc $(MAKEARGS) clean
  	$(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean
  	$(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean
  
! utils: 
! 	$(MAKE) -C ..\..\utils\build\msw -f makefile.gcc $(MAKEARGS)
  
  modules: 
***************
*** 271,282 ****
  	$(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS)
  
! docs: 
! 	@echo =============================================
! 	@echo Creating wxArt2d docs using doxygen...
! 	@echo =============================================
! 	cd ..\..\doc
! 	doxygen doxygen.inc
! 
! .PHONY: all clean thirdyparty modules apps
  
  
--- 57,61 ----
  	$(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS)
  
! .PHONY: all clean utils modules apps