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!
|
||||
@@ -22,7 +22,7 @@ VSCROLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
|
||||
-I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex \
|
||||
-I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
|
||||
VSCROLL_OBJECTS = \
|
||||
$(OBJS)\vscroll_vscroll.o \
|
||||
$(OBJS)\vscroll_vstest.o \
|
||||
$(OBJS)\vscroll_vscroll_rc.o
|
||||
|
||||
### Conditionally set variables: ###
|
||||
@@ -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):
|
||||
@@ -139,12 +141,12 @@ $(OBJS):
|
||||
|
||||
all: $(OBJS)\vscroll.exe
|
||||
|
||||
$(OBJS)\vscroll_vscroll.o: .\vscroll.cpp
|
||||
$(CXX) -c -o $@ $(VSCROLL_CXXFLAGS) $<
|
||||
|
||||
$(OBJS)\vscroll_vscroll_rc.o: .\vscroll.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 $(LIBDIRNAME) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib --include-dir ./../../src/regex --include-dir ./../../src/expat/lib --include-dir . $(__DLLFLAG_p_1)
|
||||
|
||||
$(OBJS)\vscroll_vstest.o: .\vstest.cpp
|
||||
$(CXX) -c -o $@ $(VSCROLL_CXXFLAGS) $<
|
||||
|
||||
clean:
|
||||
-if exist $(OBJS)\*.o del $(OBJS)\*.o
|
||||
-if exist $(OBJS)\vscroll.exe del $(OBJS)\vscroll.exe
|
||||
|
Reference in New Issue
Block a user