Build fix after changes in default help controller.

[wxWidgets.git] / contrib / build / gizmos / makefile.gcc

diff --git a/contrib/build/gizmos/makefile.gcc b/contrib/build/gizmos/makefile.gcc
index 708961ad65d4e985653a690bf3857236739c69b3..088d8a03728069d5610de4a028eeaf8aeff22287 100644 (file)
--- a/contrib/build/gizmos/makefile.gcc
+++ b/contrib/build/gizmos/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -12,28 +12,48 @@ include ../../../build/msw/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+WX_RELEASE_NODOT = 26

 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

+LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

-GIZMOSDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \
-       -Wall -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
+GIZMOSDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) -W -Wall \
+       -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+       $(CXXFLAGS)

 GIZMOSDLL_OBJECTS =  \
        $(OBJS)\gizmosdll_dummy.o \
 GIZMOSDLL_OBJECTS =  \
        $(OBJS)\gizmosdll_dummy.o \

+       $(OBJS)\gizmosdll_version_rc.o \

        $(OBJS)\gizmosdll_dynamicsash.o \
        $(OBJS)\gizmosdll_editlbox.o \
        $(OBJS)\gizmosdll_ledctrl.o \
        $(OBJS)\gizmosdll_multicell.o \
        $(OBJS)\gizmosdll_splittree.o \
        $(OBJS)\gizmosdll_statpict.o
        $(OBJS)\gizmosdll_dynamicsash.o \
        $(OBJS)\gizmosdll_editlbox.o \
        $(OBJS)\gizmosdll_ledctrl.o \
        $(OBJS)\gizmosdll_multicell.o \
        $(OBJS)\gizmosdll_splittree.o \
        $(OBJS)\gizmosdll_statpict.o

-GIZMOSLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) \
-       -Wall -I..\..\src\gizmos\..\..\include $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
+GIZMOS_XRCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) -W -Wall \
+       -I..\..\src\gizmos\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_GIZMOS_XRC \
+       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+       $(CXXFLAGS)
+GIZMOS_XRCDLL_OBJECTS =  \
+       $(OBJS)\gizmos_xrcdll_dummy.o \
+       $(OBJS)\gizmos_xrcdll_version_rc.o \
+       $(OBJS)\gizmos_xrcdll_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) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) -W -Wall \
+       -I..\..\src\gizmos\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)

 GIZMOSLIB_OBJECTS =  \
        $(OBJS)\gizmoslib_dummy.o \
        $(OBJS)\gizmoslib_dynamicsash.o \
 GIZMOSLIB_OBJECTS =  \
        $(OBJS)\gizmoslib_dummy.o \
        $(OBJS)\gizmoslib_dynamicsash.o \


@@ -42,6 +62,16 @@ GIZMOSLIB_OBJECTS =  \
        $(OBJS)\gizmoslib_multicell.o \
        $(OBJS)\gizmoslib_splittree.o \
        $(OBJS)\gizmoslib_statpict.o
        $(OBJS)\gizmoslib_multicell.o \
        $(OBJS)\gizmoslib_splittree.o \
        $(OBJS)\gizmoslib_statpict.o

+GIZMOS_XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+       -I..\..\src\gizmos\..\..\..\include -I$(SETUPHDIR) -W -Wall \
+       -I..\..\src\gizmos\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+GIZMOS_XRCLIB_OBJECTS =  \
+       $(OBJS)\gizmos_xrclib_dummy.o \
+       $(OBJS)\gizmos_xrclib_xh_statpict.o

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -77,13 +107,72 @@ endif
 ifeq ($(SHARED),1)
 WXDLLFLAG = dll
 endif
 ifeq ($(SHARED),1)
 WXDLLFLAG = dll
 endif

+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif

 ifeq ($(SHARED),1)
 __gizmosdll___depname = \
 ifeq ($(SHARED),1)
 __gizmosdll___depname = \

-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll
+endif
+ifeq ($(SHARED),1)
+ifeq ($(USE_XRC),1)
+__gizmos_xrcdll___depname = \
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll
+endif
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XRC_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_XML_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml
+endif
+ifeq ($(SHARED),0)
+__gizmoslib___depname = \
+       $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a
+endif
+ifeq ($(SHARED),0)
+ifeq ($(USE_XRC),1)
+__gizmos_xrclib___depname = \
+       $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a
+endif
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_0 = --define __WXUNIVERSAL__
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p_0 = --define __WXDEBUG__
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p_0 = --define __WXDEBUG__
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_0 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_0 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_0 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_0 = --define _UNICODE

 endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \
 endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \

-       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)

 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)


@@ -98,15 +187,12 @@ ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows
 endif
 ifeq ($(MONOLITHIC),0)
 __UNICOWS_LIB_p = -lunicows
 endif
 ifeq ($(MONOLITHIC),0)

-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-endif
-ifeq ($(MONOLITHIC),0)

 __WXLIB_CORE_p = \
 __WXLIB_CORE_p = \

-       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core

 endif
 endif

-ifeq ($(SHARED),0)
-__gizmoslib___depname = \
-       $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)

 endif
 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_INFO),default)
 endif
 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_INFO),default)


@@ -130,17 +216,23 @@ endif
 ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
 ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif

-ifeq ($(USE_EXCEPTIONS),0)
-__EXCEPTIONSFLAG = -fno-rtti
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 

 endif
 endif

-ifeq ($(USE_EXCEPTIONS),1)
-__EXCEPTIONSFLAG = 
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG = 

 endif
 ifeq ($(USE_EXCEPTIONS),0)
 endif
 ifeq ($(USE_EXCEPTIONS),0)

-__EXCEPTIONSFLAG_0 = -fno-exceptions
+__EXCEPTIONSFLAG = -fno-exceptions

 endif
 ifeq ($(USE_EXCEPTIONS),1)
 endif
 ifeq ($(USE_EXCEPTIONS),1)

-__EXCEPTIONSFLAG_0 = 
+__EXCEPTIONSFLAG = 

 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__


@@ -153,14 +245,17 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif

-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -D_UNICODE
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS

 endif
 endif

-ifeq ($(SHARED),0)
-LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\gcc_lib$(CFG)
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI

 endif
 endif

-ifeq ($(SHARED),1)
-LIBDIRNAME = ..\..\src\gizmos\..\..\..\lib\gcc_dll$(CFG)
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE

 endif
 
 
 endif
 
 


@@ -170,29 +265,51 @@ $(OBJS):
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: $(__gizmosdll___depname) $(__gizmoslib___depname)
+all: $(__gizmosdll___depname) $(__gizmos_xrcdll___depname) $(__gizmoslib___depname) $(__gizmos_xrclib___depname)

 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o

-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll
-       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a
-       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll
+       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a
+       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a
+       -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a

 
 ifeq ($(SHARED),1)
 
 ifeq ($(SHARED),1)

-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS)
-       $(CXX) -shared -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32  $(__WXLIB_BASE_p)  $(__WXLIB_CORE_p)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG).dll: $(GIZMOSDLL_OBJECTS) $(OBJS)\gizmosdll_version_rc.o
+       $(CXX) -shared -fPIC -o $@ $(GIZMOSDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.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),1)
+ifeq ($(USE_XRC),1)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG).dll: $(GIZMOS_XRCDLL_OBJECTS) $(OBJS)\gizmos_xrcdll_version_rc.o $(__gizmosdll___depname)
+       $(CXX) -shared -fPIC -o $@ $(GIZMOS_XRCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.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  $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a $(__WXLIB_XRC_p)  $(__WXLIB_XML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
+endif

 endif
 
 ifeq ($(SHARED),0)
 endif
 
 ifeq ($(SHARED),0)

-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos.a: $(GIZMOSLIB_OBJECTS)
+$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos.a: $(GIZMOSLIB_OBJECTS)

        if exist $@ del $@
        ar rcu $@ $(GIZMOSLIB_OBJECTS)
        ranlib $@
 endif
 
        if exist $@ del $@
        ar rcu $@ $(GIZMOSLIB_OBJECTS)
        ranlib $@
 endif
 

+ifeq ($(SHARED),0)
+ifeq ($(USE_XRC),1)
+$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc.a: $(GIZMOS_XRCLIB_OBJECTS)
+       if exist $@ del $@
+       ar rcu $@ $(GIZMOS_XRCLIB_OBJECTS)
+       ranlib $@
+endif
+endif
+

 $(OBJS)\gizmosdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 
 $(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
+       windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ../../src/gizmos/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_gcc$(VENDORTAG)
+

 $(OBJS)\gizmosdll_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 
 $(OBJS)\gizmosdll_dynamicsash.o: ../../src/gizmos/dynamicsash.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 


@@ -211,6 +328,15 @@ $(OBJS)\gizmosdll_splittree.o: ../../src/gizmos/splittree.cpp
 $(OBJS)\gizmosdll_statpict.o: ../../src/gizmos/statpict.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 
 $(OBJS)\gizmosdll_statpict.o: ../../src/gizmos/statpict.cpp
        $(CXX) -c -o $@ $(GIZMOSDLL_CXXFLAGS) $<
 

+$(OBJS)\gizmos_xrcdll_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
+       $(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
+
+$(OBJS)\gizmos_xrcdll_version_rc.o: ../../src/gizmos/../../../src/msw/version.rc
+       windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_0) $(__DEBUG_DEFINE_p_0) $(__EXCEPTIONS_DEFINE_p_0) $(__RTTI_DEFINE_p_0) $(__THREAD_DEFINE_p_0) $(__UNICODE_DEFINE_p_0) --include-dir ../../src/gizmos/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos_xrc_gcc$(VENDORTAG)
+
+$(OBJS)\gizmos_xrcdll_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp
+       $(CXX) -c -o $@ $(GIZMOS_XRCDLL_CXXFLAGS) $<
+

 $(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 
 $(OBJS)\gizmoslib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
        $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 


@@ -232,4 +358,12 @@ $(OBJS)\gizmoslib_splittree.o: ../../src/gizmos/splittree.cpp
 $(OBJS)\gizmoslib_statpict.o: ../../src/gizmos/statpict.cpp
        $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 
 $(OBJS)\gizmoslib_statpict.o: ../../src/gizmos/statpict.cpp
        $(CXX) -c -o $@ $(GIZMOSLIB_CXXFLAGS) $<
 

+$(OBJS)\gizmos_xrclib_dummy.o: ../../src/gizmos/../../../src/msw/dummy.cpp
+       $(CXX) -c -o $@ $(GIZMOS_XRCLIB_CXXFLAGS) $<
+
+$(OBJS)\gizmos_xrclib_xh_statpict.o: ../../src/gizmos/xh_statpict.cpp
+       $(CXX) -c -o $@ $(GIZMOS_XRCLIB_CXXFLAGS) $<
+

 .PHONY: all clean
 .PHONY: all clean

+
+