X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cf9b63b38a7ed96d8a824256f1fb23565c0fb52a..54638f9e668f5732427a4e0c1f073f085467058b:/contrib/build/plot/makefile.wat?ds=sidebyside diff --git a/contrib/build/plot/makefile.wat b/contrib/build/plot/makefile.wat index 6f129d49cd..bfee3d7fb7 100644 --- a/contrib/build/plot/makefile.wat +++ b/contrib/build/plot/makefile.wat @@ -269,7 +269,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD @%append $(OBJS)\plotdll.lbc option caseexact @%append $(OBJS)\plotdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) @for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i - @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i + @for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i @%append $(OBJS)\plotdll.lbc option resource=$(OBJS)\plotdll_version.res @%append $(OBJS)\plotdll.lbc system nt_dll wlink @$(OBJS)\plotdll.lbc @@ -283,7 +283,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD wlib -q -p4096 -n -b $^@ @$(OBJS)\plotlib.lbc !endif -$(OBJS)\plotdll_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\msw\dummy.cpp +$(OBJS)\plotdll_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $< $(OBJS)\plotdll_version.res : .AUTODEPEND ../../src/plot\..\..\..\src\msw\version.rc @@ -292,7 +292,7 @@ $(OBJS)\plotdll_version.res : .AUTODEPEND ../../src/plot\..\..\..\src\msw\versi $(OBJS)\plotdll_plot.obj : .AUTODEPEND ../../src/plot\plot.cpp $(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $< -$(OBJS)\plotlib_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\msw\dummy.cpp +$(OBJS)\plotlib_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\common\dummy.cpp $(CXX) -bt=nt -zq -fo=$^@ $(PLOTLIB_CXXFLAGS) $< $(OBJS)\plotlib_plot.obj : .AUTODEPEND ../../src/plot\plot.cpp