Added wxODBC change notes

[wxWidgets.git] / samples / mfc / makefile.gcc

diff --git a/samples/mfc/makefile.gcc b/samples/mfc/makefile.gcc
index a710aa2dc0590685f2aff70e9b5e85162d5b337f..1c97b17be3c900f2ef0b1bffe88dc1f6cb990e9d 100644 (file)
--- a/samples/mfc/makefile.gcc
+++ b/samples/mfc/makefile.gcc
@@ -1,10 +1,10 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-include ../../build/config.gcc
+include ../../build/msw/config.gcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -12,18 +12,18 @@ include ../../build/config.gcc
 
 ### Variables: ###
 
-LIBDIRNAME = \
-       .\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-MFC_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
-       -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(LIBDIRNAME) -I.\..\..\src\tiff \
-       -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex \
-       -I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
-MFC_OBJECTS =  \
-       $(OBJS)\mfc_mfc.o \
-       $(OBJS)\mfc_mfc_rc.o
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+MFCTEST_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. \
+       $(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \
+       $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
+MFCTEST_OBJECTS =  \
+       $(OBJS)\mfctest_mfctest.o \
+       $(OBJS)\mfctest_mfctest_rc.o
 
 ### Conditionally set variables: ###
 
@@ -44,30 +44,38 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 WXDEBUGFLAG = d
 endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
 ifeq ($(UNICODE),1)
 WXUNICODEFLAG = u
 endif
 ifeq ($(WXUNIV),1)
 WXUNIVNAME = univ
 endif
-ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
 endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
 endif
 ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = 
+__OPTIMIZEFLAG_2 = -O2
 endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_4 = -fno-rtti
 endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO = 
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_4 = 
 endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_5 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_5 = 
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_FLAG),default)
@@ -85,49 +93,62 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 __DEBUG_DEFINE_p_1 = --define __WXDEBUG__
 endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+endif
 ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
 endif
-ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG_2 = -O0
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
 endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG_2 = -O2
+ifeq ($(SHARED),0)
+LIBDIRNAME = .\..\..\lib\gcc_lib$(CFG)
 endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+ifeq ($(SHARED),1)
+LIBDIRNAME = .\..\..\lib\gcc_dll$(CFG)
 endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
-       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
 endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
-       -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
 endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
 endif
 
 
@@ -137,19 +158,19 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\mfc.exe
-
-$(OBJS)\mfc_mfc.o: .\mfc.cpp
-       $(CXX) -c -o $@ $(MFC_CXXFLAGS) $<
-
-$(OBJS)\mfc_mfc_rc.o: .\mfc.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 $(LIBDIRNAME) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib  --include-dir ./../../src/regex --include-dir ./../../src/expat/lib --include-dir . $(__DLLFLAG_p_1)
+all: $(OBJS)\mfctest.exe
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
-       -if exist $(OBJS)\mfc.exe del $(OBJS)\mfc.exe
+       -if exist $(OBJS)\mfctest.exe del $(OBJS)\mfctest.exe
+
+$(OBJS)\mfctest.exe: $(MFCTEST_OBJECTS) $(OBJS)\mfctest_mfctest_rc.o
+       $(CXX) -o $@ $(MFCTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__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
+
+$(OBJS)\mfctest_mfctest.o: ./mfctest.cpp
+       $(CXX) -c -o $@ $(MFCTEST_CXXFLAGS) $<
 
-$(OBJS)\mfc.exe: $(MFC_OBJECTS) $(OBJS)\mfc_mfc_rc.o
-       $(CXX) -o $@ $(MFC_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+$(OBJS)\mfctest_mfctest_rc.o: ./mfctest.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
 
 .PHONY: all clean