Updated makefiles etc. for 2.5.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -14,8 +14,8 @@ include ../../build/msw/config.gcc
 | 
			
		||||
 | 
			
		||||
DBBROWSE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
 | 
			
		||||
	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 | 
			
		||||
	$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
 | 
			
		||||
	-I.\..\..\samples $(CXXFLAGS)
 | 
			
		||||
	$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \
 | 
			
		||||
	$(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS)
 | 
			
		||||
DBBROWSE_OBJECTS =  \
 | 
			
		||||
	$(OBJS)\dbbrowse_dbbrowse.o \
 | 
			
		||||
	$(OBJS)\dbbrowse_doc.o \
 | 
			
		||||
@@ -119,10 +119,10 @@ ifeq ($(BUILD),release)
 | 
			
		||||
__OPTIMIZEFLAG_2 = -O2
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(UNICODE),1)
 | 
			
		||||
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 | 
			
		||||
__UNICODE_DEFINE_p = -D_UNICODE
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(UNICODE),1)
 | 
			
		||||
__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 | 
			
		||||
__UNICODE_DEFINE_p_1 = --define _UNICODE
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(MSLU),1)
 | 
			
		||||
__UNICOWS_LIB_p = -lunicows
 | 
			
		||||
@@ -176,7 +176,7 @@ $(OBJS)\dbbrowse_dbbrowse.o: ./dbbrowse.cpp
 | 
			
		||||
	$(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 | 
			
		||||
 | 
			
		||||
$(OBJS)\dbbrowse_dbbrowse_rc.o: ./dbbrowse.rc
 | 
			
		||||
	windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
 | 
			
		||||
	windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
 | 
			
		||||
 | 
			
		||||
$(OBJS)\dbbrowse_dbgrid.o: ./dbgrid.cpp
 | 
			
		||||
	$(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 | 
			
		||||
@@ -201,6 +201,6 @@ clean:
 | 
			
		||||
	-if exist $(OBJS)\dbbrowse.exe del $(OBJS)\dbbrowse.exe
 | 
			
		||||
 | 
			
		||||
$(OBJS)\dbbrowse.exe: $(DBBROWSE_OBJECTS) $(OBJS)\dbbrowse_dbbrowse_rc.o
 | 
			
		||||
	$(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_DBGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_ODBC_p) $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
 | 
			
		||||
	$(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
 | 
			
		||||
 | 
			
		||||
.PHONY: all clean
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user