Renewed makefiles after reverting run-time lib change

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

diff --git a/samples/access/makefile.gcc b/samples/access/makefile.gcc
index c90d0a28e88b024ff4c26f7d0b215877a1f9814b..b2fbc9559141a43929b6e27462a33b3183dcccbc 100644 (file)
--- a/samples/access/makefile.gcc
+++ b/samples/access/makefile.gcc
@@ -1,45 +1,10 @@
-

 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (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!
 # =========================================================================
 

-
-# -------------------------------------------------------------------------
-# These are configurable options:
-# -------------------------------------------------------------------------
-
-# Type of compiled binaries [debug,release]
-BUILD = release
-# Name of your custom configuration. This affects directory
-#            where object files are stored as well as the location of
-#            compiled .lib files and setup.h under the lib/ toplevel directory. 
-CFG = 
-# Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS = 
-# C++ compiler 
-CXX = g++
-# Standard flags for C++ 
-CXXFLAGS = 
-# Set the version of your Mingw installation here.
-#                "3" ...... this is for Mingw 2.0 or newer that cames with gcc3
-#                "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95]
-GCC_VERSION = 3
-# Standard linker flags 
-LDFLAGS = 
-# Multiple libraries or single huge monolithic one? [0,1]
-MONOLITHIC = 1
-# Is this official build by wxWindows developers? [0,1]
-OFFICIAL_BUILD = 0
-# What type of library to build? [0,1]
-SHARED = 1
-# Compile Unicode build of wxWindows? [0,1]
-UNICODE = 0
-# Build GUI libraries? [0,1]
-USE_GUI = 1
-# Build wxUniversal instead of native port? [0,1]
-WXUNIV = 0
+include ../../build/msw/config.gcc

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -47,11 +12,27 @@ WXUNIV = 0
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-OBJS = gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-ACCESSTEST_CXXFLAGS = $(CPPFLAGS) -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib  -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS)
+WX_RELEASE_NODOT = 26
+OBJS = \
+       gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ACCESSTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__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.\..\..\include -I$(SETUPHDIR) \
+       -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \
+       $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+ACCESSTEST_OBJECTS =  \
+       $(OBJS)\accesstest_accesstest.o \
+       $(OBJS)\accesstest_accesstest_rc.o

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

+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif

 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif


@@ -59,10 +40,12 @@ ifeq ($(USE_GUI),1)
 PORTNAME = msw
 endif
 ifeq ($(BUILD),debug)
 PORTNAME = msw
 endif
 ifeq ($(BUILD),debug)

+ifeq ($(DEBUG_FLAG),default)

 WXDEBUGFLAG = d
 endif
 WXDEBUGFLAG = d
 endif

-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
+endif
+ifeq ($(DEBUG_FLAG),1)
+WXDEBUGFLAG = d

 endif
 ifeq ($(UNICODE),1)
 WXUNICODEFLAG = u
 endif
 ifeq ($(UNICODE),1)
 WXUNICODEFLAG = u


@@ -70,38 +53,136 @@ endif
 ifeq ($(WXUNIV),1)
 WXUNIVNAME = univ
 endif
 ifeq ($(WXUNIV),1)
 WXUNIVNAME = univ
 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 ($(BUILD),debug)
 ifeq ($(BUILD),debug)

+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 = 
+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)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+endif
+endif
+ifeq ($(DEBUG_FLAG),1)

 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 ifeq ($(BUILD),debug)
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 ifeq ($(BUILD),debug)

+ifeq ($(DEBUG_FLAG),default)

 __DEBUG_DEFINE_p_1 = --define __WXDEBUG__
 endif
 __DEBUG_DEFINE_p_1 = --define __WXDEBUG__
 endif

-ifeq ($(SHARED),1)
-__DLLFLAG_p = -DWXUSINGDLL

 endif
 endif

-ifeq ($(SHARED),1)
-__DLLFLAG_p_1 = --define WXUSINGDLL
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS

 endif
 ifeq ($(UNICODE),1)
 endif
 ifeq ($(UNICODE),1)

-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE

 endif
 ifeq ($(UNICODE),1)
 endif
 ifeq ($(UNICODE),1)

-__UNICODE_DEFINE_p_1 = --define wxUSE_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)
 endif
 ifeq ($(MONOLITHIC),0)

-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+__WXLIB_CORE_p = \
+       -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core

 endif
 ifeq ($(MONOLITHIC),0)
 endif
 ifeq ($(MONOLITHIC),0)

-__WXLIB_CORE_p = -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+__WXLIB_BASE_p = \
+       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)

 endif
 ifeq ($(MONOLITHIC),1)
 endif
 ifeq ($(MONOLITHIC),1)

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

 endif
 endif

-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)

 endif
 endif

-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads

 endif
 
 
 endif
 
 


@@ -113,21 +194,19 @@ $(OBJS):
 
 all: $(OBJS)\accesstest.exe
 
 
 all: $(OBJS)\accesstest.exe
 

-$(OBJS)\accesstest_accesstest.o: .\accesstest.cpp
-       $(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $<
-
-$(OBJS)\accesstest_accesstest_rc.o: .\accesstest.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 ./../../lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib  --include-dir ./../../src/regex --include-dir . $(__DLLFLAG_p_1)
-
-$(OBJS)\accesstest.exe: $(OBJS)\accesstest_accesstest.o $(OBJS)\accesstest_accesstest_rc.o
-       $(CXX) -o $@  $(OBJS)\accesstest_accesstest.o $(OBJS)\accesstest_accesstest_rc.o $(LDFLAGS) -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -Wl,--subsystem,windows -mwindows  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
-

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

-install: all
+$(OBJS)\accesstest.exe: $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest_rc.o
+       $(CXX) -o $@ $(ACCESSTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -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) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
+
+$(OBJS)\accesstest_accesstest.o: ./accesstest.cpp
+       $(CXX) -c -o $@ $(ACCESSTEST_CXXFLAGS) $<
+
+$(OBJS)\accesstest_accesstest_rc.o: ./accesstest.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 ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+.PHONY: all clean

 
 

-uninstall: 

 
 

-.PHONY: all