1) some compilers (Watcom) don't like it if wxBase library PCH file contains
symbols from GUI components and won't link a DLL 2) fixed subdirs recursion code - all options must be output 3) fixed subdirs recursion code - all options must be output 4) fix for watcom resource compiler git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -12,12 +12,17 @@ include ../../build/msw/config.gcc
 | 
			
		||||
 | 
			
		||||
### Variables: ###
 | 
			
		||||
 | 
			
		||||
MAKEARGS = CPPFLAGS=$(CPPFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) LDFLAGS=$(LDFLAGS) \
 | 
			
		||||
	CC=$(CC) USE_GUI=$(USE_GUI) MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) \
 | 
			
		||||
	GCC_VERSION=$(GCC_VERSION) USE_HTML=$(USE_HTML) BUILD=$(BUILD) \
 | 
			
		||||
	DEBUG_INFO=$(DEBUG_INFO) VENDOR=$(VENDOR) UNICODE=$(UNICODE) \
 | 
			
		||||
	OFFICIAL_BUILD=$(OFFICIAL_BUILD) MSLU=$(MSLU) WXUNIV=$(WXUNIV) \
 | 
			
		||||
	RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) CFLAGS=$(CFLAGS) \
 | 
			
		||||
	SHARED=$(SHARED) USE_ODBC=$(USE_ODBC) USE_OPENGL=$(USE_OPENGL)
 | 
			
		||||
 | 
			
		||||
### Conditionally set variables: ###
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
MAKEARGS = GCC_VERSION=$(GCC_VERSION)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
### Targets: ###
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user