X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf9b63b38a7ed96d8a824256f1fb23565c0fb52a..e5d1e06de3949d39111f0d6b2eef69cd30d6885b:/contrib/build/plot/makefile.gcc diff --git a/contrib/build/plot/makefile.gcc b/contrib/build/plot/makefile.gcc index 1ce7f69746..7574b4feaf 100644 --- a/contrib/build/plot/makefile.gcc +++ b/contrib/build/plot/makefile.gcc @@ -232,7 +232,7 @@ clean: ifeq ($(SHARED),1) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_gcc$(VENDORTAG).dll: $(PLOTDLL_OBJECTS) $(OBJS)\plotdll_version_rc.o - $(CXX) -shared -fPIC -o $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.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 $@ $(PLOTDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot.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) @@ -242,7 +242,7 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$( ranlib $@ endif -$(OBJS)\plotdll_dummy.o: ../../src/plot/../../../src/msw/dummy.cpp +$(OBJS)\plotdll_dummy.o: ../../src/plot/../../../src/common/dummy.cpp $(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\plotdll_version_rc.o: ../../src/plot/../../../src/msw/version.rc @@ -251,7 +251,7 @@ $(OBJS)\plotdll_version_rc.o: ../../src/plot/../../../src/msw/version.rc $(OBJS)\plotdll_plot.o: ../../src/plot/plot.cpp $(CXX) -c -o $@ $(PLOTDLL_CXXFLAGS) $(CPPDEPS) $< -$(OBJS)\plotlib_dummy.o: ../../src/plot/../../../src/msw/dummy.cpp +$(OBJS)\plotlib_dummy.o: ../../src/plot/../../../src/common/dummy.cpp $(CXX) -c -o $@ $(PLOTLIB_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\plotlib_plot.o: ../../src/plot/plot.cpp