Removed ambiguity between deprecated and new constructor.

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

diff --git a/contrib/build/foldbar/makefile.gcc b/contrib/build/foldbar/makefile.gcc
index 205ed04f6f9333d1d92207205b1f1b95fd6f6163..dccc4d289260cdd9278a752891ba460b58d2804b 100644 (file)
--- a/contrib/build/foldbar/makefile.gcc
+++ b/contrib/build/foldbar/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.6 (http://bakefile.sourceforge.net)

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


@@ -13,16 +13,18 @@ include ../../../build/msw/config.gcc
 ### Variables: ###
 
 WX_RELEASE_NODOT = 25
 ### Variables: ###
 
 WX_RELEASE_NODOT = 25

-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)2
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4

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

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

 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 FOLDBARDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\foldbar\..\..\..\include -I$(SETUPHDIR) \
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 FOLDBARDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\foldbar\..\..\..\include -I$(SETUPHDIR) \

-       -Wall -I..\..\src\foldbar\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_FOLDBAR \
-       $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
+       -W -Wall -I..\..\src\foldbar\..\..\include -DWXUSINGDLL \
+       -DWXMAKINGDLL_FOLDBAR $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
+       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)

 FOLDBARDLL_OBJECTS =  \
        $(OBJS)\foldbardll_dummy.o \
        $(OBJS)\foldbardll_captionbar.o \
 FOLDBARDLL_OBJECTS =  \
        $(OBJS)\foldbardll_dummy.o \
        $(OBJS)\foldbardll_captionbar.o \


@@ -31,8 +33,8 @@ FOLDBARDLL_OBJECTS =  \
 FOLDBARLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\foldbar\..\..\..\include -I$(SETUPHDIR) \
 FOLDBARLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
        $(__UNICODE_DEFINE_p) -I..\..\src\foldbar\..\..\..\include -I$(SETUPHDIR) \

-       -Wall -I..\..\src\foldbar\..\..\include $(__EXCEPTIONSFLAG) \
-       $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
+       -W -Wall -I..\..\src\foldbar\..\..\include $(__EXCEPTIONSFLAG) \
+       $(__EXCEPTIONSFLAG_0) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)

 FOLDBARLIB_OBJECTS =  \
        $(OBJS)\foldbarlib_dummy.o \
        $(OBJS)\foldbarlib_captionbar.o \
 FOLDBARLIB_OBJECTS =  \
        $(OBJS)\foldbarlib_dummy.o \
        $(OBJS)\foldbarlib_captionbar.o \


@@ -73,6 +75,18 @@ 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)
 __foldbardll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG).dll
 ifeq ($(SHARED),1)
 __foldbardll___depname = \
        $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG).dll


@@ -82,13 +96,13 @@ __WXLIB_MONO_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 endif
 ifeq ($(USE_GUI),1)
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 endif
 ifeq ($(USE_GUI),1)

-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)

 endif
 ifeq ($(USE_GUI),1)
 endif
 ifeq ($(USE_GUI),1)

-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)

 endif
 ifeq ($(USE_GUI),1)
 endif
 ifeq ($(USE_GUI),1)

-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)

 endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows
 endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows


@@ -153,12 +167,6 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif

-ifeq ($(SHARED),0)
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\gcc_dll$(CFG)
-endif

 
 
 all: $(OBJS)
 
 
 all: $(OBJS)


@@ -177,7 +185,7 @@ clean:
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG).dll: $(FOLDBARDLL_OBJECTS)
 
 ifeq ($(SHARED),1)
 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_gcc$(VENDORTAG).dll: $(FOLDBARDLL_OBJECTS)

-       $(CXX) -shared -o $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT) -lwxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)  $(__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 $@ $(FOLDBARDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.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)
 endif
 
 ifeq ($(SHARED),0)


@@ -212,3 +220,4 @@ $(OBJS)\foldbarlib_foldpanelitem.o: ../../src/foldbar/foldpanelitem.cpp
        $(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
 
 .PHONY: all clean
        $(CXX) -c -o $@ $(FOLDBARLIB_CXXFLAGS) $<
 
 .PHONY: all clean

+