regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -4,7 +4,7 @@
 | 
			
		||||
#     Do not modify, all changes will be overwritten!
 | 
			
		||||
# =========================================================================
 | 
			
		||||
 | 
			
		||||
include ../../build/config.gcc
 | 
			
		||||
include ../../build/msw/config.gcc
 | 
			
		||||
 | 
			
		||||
# -------------------------------------------------------------------------
 | 
			
		||||
# Do not modify the rest of this file!
 | 
			
		||||
@@ -130,6 +130,8 @@ ifeq ($(WXUNIV),1)
 | 
			
		||||
__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
all: $(OBJS)
 | 
			
		||||
$(OBJS):
 | 
			
		||||
@@ -156,4 +158,4 @@ data:
 | 
			
		||||
$(OBJS)\dragimag.exe: $(DRAGIMAG_OBJECTS) $(OBJS)\dragimag_dragimag_rc.o
 | 
			
		||||
	$(CXX) -o $@ $(DRAGIMAG_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
 | 
			
		||||
 | 
			
		||||
.PHONY: all clean
 | 
			
		||||
.PHONY: all clean data
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user