X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c9f8f91cd62335261ee29762747218f28d129de..749a05ee85ea5453f155454e4640ebf795233ad3:/contrib/build/gizmos/makefile.gcc diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc index 5330b9e5e5..0dc5e49695 100644 --- a/contrib/build/gizmos/makefile.gcc +++ b/contrib/build/gizmos/makefile.gcc @@ -35,7 +35,8 @@ GIZMOSDLL_OBJECTS = \ $(OBJS)\gizmosdll_ledctrl.o \ $(OBJS)\gizmosdll_multicell.o \ $(OBJS)\gizmosdll_splittree.o \ - $(OBJS)\gizmosdll_statpict.o + $(OBJS)\gizmosdll_statpict.o \ + $(OBJS)\gizmosdll_xh_statpict.o GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ @@ -50,7 +51,8 @@ GIZMOSLIB_OBJECTS = \ $(OBJS)\gizmoslib_ledctrl.o \ $(OBJS)\gizmoslib_multicell.o \ $(OBJS)\gizmoslib_splittree.o \ - $(OBJS)\gizmoslib_statpict.o + $(OBJS)\gizmoslib_statpict.o \ + $(OBJS)\gizmoslib_xh_statpict.o ### Conditionally set variables: ### @@ -247,7 +249,7 @@ endif $(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< -$(OBJS)\gizmosdll_version_rc.o: ../../src/gizmos/src/msw/version.rc +$(OBJS)\gizmosdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ../../src/gizmos/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG) $(OBJS)\gizmosdll_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp @@ -268,6 +270,9 @@ $(OBJS)\gizmosdll_splittree.o: ../../src/gizmos/splittree.cpp $(OBJS)\gizmosdll_statpict.o: ../../src/gizmos/statpict.cpp $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< +$(OBJS)\gizmosdll_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp + $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $< + $(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< @@ -289,6 +294,9 @@ $(OBJS)\gizmoslib_splittree.o: ../../src/gizmos/splittree.cpp $(OBJS)\gizmoslib_statpict.o: ../../src/gizmos/statpict.cpp $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< +$(OBJS)\gizmoslib_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp + $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $< + .PHONY: all clean