X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd65d8c83003ebbf9ab3275957fefa8cd7c87cc3..5614fdec8b7cd596743244dd9421883f352781f8:/samples/richedit/makefile.gcc

diff --git a/samples/richedit/makefile.gcc b/samples/richedit/makefile.gcc
index 99eaacc17f..810f4d6199 100644
--- a/samples/richedit/makefile.gcc
+++ b/samples/richedit/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     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!
 # =========================================================================
 
@@ -15,13 +15,14 @@ include ../../build/msw/config.gcc
 WX_RELEASE_NODOT = 25
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 RICHEDIT_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \
+	$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -W -Wall -I. \
 	$(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__EXCEPTIONSFLAG_4) \
-	$(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
+	$(__EXCEPTIONSFLAG_5) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 RICHEDIT_OBJECTS =  \
 	$(OBJS)\richedit_sample_rc.o \
 	$(OBJS)\richedit_wxLayout.o \
@@ -58,6 +59,12 @@ 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
@@ -140,12 +147,6 @@ endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows
 endif
-ifeq ($(SHARED),0)
-LIBDIRNAME = .\..\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-LIBDIRNAME = .\..\..\lib\gcc_dll$(CFG)
-endif
 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_INFO),default)
 __DEBUGINFO = -g
@@ -184,7 +185,7 @@ data:
 	for %%f in (wxLayout.cpp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\richedit_sample_rc.o: ./../../samples/sample.rc
-	windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
+	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
 
 $(OBJS)\richedit_wxLayout.o: ./wxLayout.cpp
 	$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
@@ -202,3 +203,4 @@ $(OBJS)\richedit_wxlwindow.o: ./wxlwindow.cpp
 	$(CXX) -c -o $@ $(RICHEDIT_CXXFLAGS) $<
 
 .PHONY: all clean data
+