Various dummy.cpp centralized in common/dummy.cpp. Build rebaked.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -263,7 +263,7 @@ clean:
|
||||
|
||||
ifeq ($(SHARED),1)
|
||||
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_gcc$(VENDORTAG).dll: $(FLDLL_OBJECTS) $(OBJS)\fldll_version_rc.o
|
||||
$(CXX) -shared -fPIC -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
|
||||
$(CXX) -shared -fPIC -o $@ $(FLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.a $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
|
||||
endif
|
||||
|
||||
ifeq ($(SHARED),0)
|
||||
@@ -273,7 +273,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
|
||||
ranlib $@
|
||||
endif
|
||||
|
||||
$(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
|
||||
$(OBJS)\fldll_dummy.o: ../../src/fl/../../../src/common/dummy.cpp
|
||||
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\fldll_version_rc.o: ../../src/fl/../../../src/msw/version.rc
|
||||
@@ -330,7 +330,7 @@ $(OBJS)\fldll_toolwnd.o: ../../src/fl/toolwnd.cpp
|
||||
$(OBJS)\fldll_updatesmgr.o: ../../src/fl/updatesmgr.cpp
|
||||
$(CXX) -c -o $@ $(FLDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\fllib_dummy.o: ../../src/fl/../../../src/msw/dummy.cpp
|
||||
$(OBJS)\fllib_dummy.o: ../../src/fl/../../../src/common/dummy.cpp
|
||||
$(CXX) -c -o $@ $(FLLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
$(OBJS)\fllib_antiflickpl.o: ../../src/fl/antiflickpl.cpp
|
||||
|
Reference in New Issue
Block a user