From 002374070e91dfcebde94f6eb2f587717ef44567 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 24 Jan 2010 01:00:20 +0000 Subject: [PATCH] Move wx/evtloop.h from GUI_CMN_HDR to BASE_CMN_HDR in files.bkl. And rebake. Now that wxEventLoop can be used in wxBase as well, we need this file to be installed as part of wxBase too. Closes #11617. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 3 +- build/bakefiles/files.bkl | 2 +- build/msw/config.bcc | 434 ++++++++++++++++----------------- build/msw/config.gcc | 300 +++++++++++------------ build/msw/config.vc | 304 +++++++++++------------ build/msw/config.wat | 286 +++++++++++----------- build/msw/makefile.bcc | 200 +++++++-------- build/msw/makefile.gcc | 200 +++++++-------- build/msw/makefile.vc | 200 +++++++-------- build/msw/makefile.wat | 200 +++++++-------- build/msw/wx_base.dsp | 4 + build/msw/wx_core.dsp | 20 +- build/msw/wx_vc7_base.vcproj | 3 + build/msw/wx_vc7_core.vcproj | 15 +- build/msw/wx_vc7_wxtiff.vcproj | 48 ++-- build/msw/wx_vc8_base.vcproj | 4 + build/msw/wx_vc8_core.vcproj | 20 +- build/msw/wx_vc8_wxtiff.vcproj | 48 ++-- build/msw/wx_vc9_base.vcproj | 4 + build/msw/wx_vc9_core.vcproj | 20 +- build/msw/wx_vc9_wxtiff.vcproj | 48 ++-- build/msw/wx_wxtiff.dsp | 32 +-- wxGTK.spec | 1 + wxMotif.spec | 1 + wxX11.spec | 1 + 25 files changed, 1201 insertions(+), 1197 deletions(-) diff --git a/Makefile.in b/Makefile.in index fdf92bd45c..df181dd334 100644 --- a/Makefile.in +++ b/Makefile.in @@ -347,6 +347,7 @@ ALL_BASE_HEADERS = \ wx/dynload.h \ wx/encconv.h \ wx/event.h \ + wx/evtloop.h \ wx/except.h \ wx/features.h \ wx/flags.h \ @@ -511,6 +512,7 @@ ALL_PORTS_BASE_HEADERS = \ wx/dynload.h \ wx/encconv.h \ wx/event.h \ + wx/evtloop.h \ wx/except.h \ wx/features.h \ wx/flags.h \ @@ -3740,7 +3742,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/docmdi.h \ wx/docview.h \ wx/effects.h \ - wx/evtloop.h \ wx/evtloopsrc.h \ wx/fdrepdlg.h \ wx/filectrl.h \ diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 5facb9bf9e..5b0caa525c 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -440,6 +440,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/dynload.h wx/encconv.h wx/event.h + wx/evtloop.h wx/except.h wx/features.h wx/flags.h @@ -896,7 +897,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/docmdi.h wx/docview.h wx/effects.h - wx/evtloop.h wx/evtloopsrc.h wx/fdrepdlg.h wx/filectrl.h diff --git a/build/msw/config.bcc b/build/msw/config.bcc index b5698678a8..c0e43a75ce 100644 --- a/build/msw/config.bcc +++ b/build/msw/config.bcc @@ -1,217 +1,217 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.8 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C compiler -!ifndef CC -CC = bcc32 -!endif - -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif - -# Standard flags for CC -!ifndef CFLAGS -CFLAGS = -!endif - -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif - -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a8 -g0 -!endif - -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif - -# The C preprocessor -!ifndef CPP -CPP = cpp32 -Sr -oCON -!endif - -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 0 -!endif - -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif - -# Compile Unicode build of wxWidgets? [0,1] -!ifndef UNICODE -UNICODE = 1 -!endif - -# Use MSLU library when building Unicode version. [0,1] -!ifndef MSLU -MSLU = 0 -!endif - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = debug -!endif - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -!ifndef DEBUG_INFO -DEBUG_INFO = default -!endif - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -!ifndef DEBUG_FLAG -DEBUG_FLAG = 1 -!endif - -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 0 -!endif - -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -!ifndef USE_HTML -USE_HTML = 1 -!endif - -# Build multimedia library (USE_GUI must be 1)? [0,1] -!ifndef USE_MEDIA -USE_MEDIA = 1 -!endif - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -!ifndef USE_XRC -USE_XRC = 1 -!endif - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -!ifndef USE_AUI -USE_AUI = 1 -!endif - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -!ifndef USE_RIBBON -USE_RIBBON = 1 -!endif - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -!ifndef USE_PROPGRID -USE_PROPGRID = 1 -!endif - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -!ifndef USE_RICHTEXT -USE_RICHTEXT = 1 -!endif - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -!ifndef USE_STC -USE_STC = 1 -!endif - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -!ifndef USE_OPENGL -USE_OPENGL = 1 -!endif - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -!ifndef USE_QA -USE_QA = 0 -!endif - -# Enable exceptions in compiled code. [0,1] -!ifndef USE_EXCEPTIONS -USE_EXCEPTIONS = 1 -!endif - -# Enable run-time type information (RTTI) in compiled code. [0,1] -!ifndef USE_RTTI -USE_RTTI = 1 -!endif - -# Enable threading in compiled code. [0,1] -!ifndef USE_THREADS -USE_THREADS = 1 -!endif - -# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] -!ifndef USE_CAIRO -USE_CAIRO = 0 -!endif - -# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] -!ifndef USE_GDIPLUS -USE_GDIPLUS = 0 -!endif - -# Is this official build by wxWidgets developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif - -# Use this to name your customized DLLs differently -!ifndef VENDOR -VENDOR = custom -!endif - -# -!ifndef WX_FLAVOUR -WX_FLAVOUR = -!endif - -# -!ifndef WX_LIB_FLAVOUR -WX_LIB_FLAVOUR = -!endif - -# 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. -!ifndef CFG -CFG = -!endif - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -!ifndef CPPUNIT_CFLAGS -CPPUNIT_CFLAGS = -!endif - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -!ifndef CPPUNIT_LIBS -CPPUNIT_LIBS = -!endif - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -!ifndef RUNTIME_LIBS -RUNTIME_LIBS = dynamic -!endif - +# ========================================================================= +# This configuration file was generated by +# Bakefile 0.2.8 (http://www.bakefile.org) +# Beware that all changes made to this file will be overwritten next +# time you run Bakefile! +# ========================================================================= + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# C compiler +!ifndef CC +CC = bcc32 +!endif + +# C++ compiler +!ifndef CXX +CXX = bcc32 +!endif + +# Standard flags for CC +!ifndef CFLAGS +CFLAGS = +!endif + +# Standard flags for C++ +!ifndef CXXFLAGS +CXXFLAGS = +!endif + +# Standard preprocessor flags (common for CC and CXX) +!ifndef CPPFLAGS +CPPFLAGS = -a8 -g0 +!endif + +# Standard linker flags +!ifndef LDFLAGS +LDFLAGS = +!endif + +# The C preprocessor +!ifndef CPP +CPP = cpp32 -Sr -oCON +!endif + +# What type of library to build? [0,1] +!ifndef SHARED +SHARED = 0 +!endif + +# Build wxUniversal instead of native port? [0,1] +!ifndef WXUNIV +WXUNIV = 0 +!endif + +# Compile Unicode build of wxWidgets? [0,1] +!ifndef UNICODE +UNICODE = 1 +!endif + +# Use MSLU library when building Unicode version. [0,1] +!ifndef MSLU +MSLU = 0 +!endif + +# Type of compiled binaries [debug,release] +!ifndef BUILD +BUILD = debug +!endif + +# Should debugging info be included in the executables? The default value +# "default" means that debug info will be included if BUILD=debug +# and not included if BUILD=release. [0,1,default] +!ifndef DEBUG_INFO +DEBUG_INFO = default +!endif + +# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all +# but expensive assert checks are enabled, use 0 to completely remove debugging +# code. [0,1,default] +!ifndef DEBUG_FLAG +DEBUG_FLAG = 1 +!endif + +# Multiple libraries or single huge monolithic one? [0,1] +!ifndef MONOLITHIC +MONOLITHIC = 0 +!endif + +# Build GUI libraries? [0,1] +!ifndef USE_GUI +USE_GUI = 1 +!endif + +# Build wxHTML library (USE_GUI must be 1)? [0,1] +!ifndef USE_HTML +USE_HTML = 1 +!endif + +# Build multimedia library (USE_GUI must be 1)? [0,1] +!ifndef USE_MEDIA +USE_MEDIA = 1 +!endif + +# Build wxXRC library (USE_GUI must be 1)? [0,1] +!ifndef USE_XRC +USE_XRC = 1 +!endif + +# Build wxAUI library (USE_GUI must be 1)? [0,1] +!ifndef USE_AUI +USE_AUI = 1 +!endif + +# Build wxRibbon library (USE_GUI must be 1)? [0,1] +!ifndef USE_RIBBON +USE_RIBBON = 1 +!endif + +# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] +!ifndef USE_PROPGRID +USE_PROPGRID = 1 +!endif + +# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] +!ifndef USE_RICHTEXT +USE_RICHTEXT = 1 +!endif + +# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] +!ifndef USE_STC +USE_STC = 1 +!endif + +# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] +!ifndef USE_OPENGL +USE_OPENGL = 1 +!endif + +# Build quality assurance classes library (USE_GUI must be 1)? [0,1] +!ifndef USE_QA +USE_QA = 0 +!endif + +# Enable exceptions in compiled code. [0,1] +!ifndef USE_EXCEPTIONS +USE_EXCEPTIONS = 1 +!endif + +# Enable run-time type information (RTTI) in compiled code. [0,1] +!ifndef USE_RTTI +USE_RTTI = 1 +!endif + +# Enable threading in compiled code. [0,1] +!ifndef USE_THREADS +USE_THREADS = 1 +!endif + +# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] +!ifndef USE_CAIRO +USE_CAIRO = 0 +!endif + +# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] +!ifndef USE_GDIPLUS +USE_GDIPLUS = 0 +!endif + +# Is this official build by wxWidgets developers? [0,1] +!ifndef OFFICIAL_BUILD +OFFICIAL_BUILD = 0 +!endif + +# Use this to name your customized DLLs differently +!ifndef VENDOR +VENDOR = custom +!endif + +# +!ifndef WX_FLAVOUR +WX_FLAVOUR = +!endif + +# +!ifndef WX_LIB_FLAVOUR +WX_LIB_FLAVOUR = +!endif + +# 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. +!ifndef CFG +CFG = +!endif + +# Compiler flags needed to compile test suite in tests directory. If you want +# to run the tests, set it so that the compiler can find CppUnit headers. +!ifndef CPPUNIT_CFLAGS +CPPUNIT_CFLAGS = +!endif + +# Linker flags needed to link test suite in tests directory. If you want +# to run the tests, include CppUnit library here. +!ifndef CPPUNIT_LIBS +CPPUNIT_LIBS = +!endif + +# Version of C runtime library to use. You can change this to +# static if SHARED=0, but it is highly recommended to not do +# it if SHARED=1 unless you know what you are doing. [dynamic,static] +!ifndef RUNTIME_LIBS +RUNTIME_LIBS = dynamic +!endif + diff --git a/build/msw/config.gcc b/build/msw/config.gcc index feee56989b..e35b9620a2 100644 --- a/build/msw/config.gcc +++ b/build/msw/config.gcc @@ -1,150 +1,150 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.8 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Compiler flags to link shared library -LINK_DLL_FLAGS ?= -shared - -# Compiler flags to link loadable module -LINK_MODULE_FLAGS ?= -shared - -# C compiler -CC = gcc - -# C++ compiler -CXX = g++ - -# Standard flags for CC -CFLAGS ?= - -# Standard flags for C++ -CXXFLAGS ?= - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS ?= - -# Standard linker flags -LDFLAGS ?= - -# The C preprocessor -CPP ?= $(CC) -E - -# What type of library to build? [0,1] -SHARED ?= 0 - -# Build wxUniversal instead of native port? [0,1] -WXUNIV ?= 0 - -# Compile Unicode build of wxWidgets? [0,1] -UNICODE ?= 1 - -# Use MSLU library when building Unicode version. [0,1] -MSLU ?= 0 - -# Type of compiled binaries [debug,release] -BUILD ?= debug - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -DEBUG_INFO ?= default - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -DEBUG_FLAG ?= 1 - -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC ?= 0 - -# Build GUI libraries? [0,1] -USE_GUI ?= 1 - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -USE_HTML ?= 1 - -# Build multimedia library (USE_GUI must be 1)? [0,1] -USE_MEDIA ?= 1 - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -USE_XRC ?= 1 - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -USE_AUI ?= 1 - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -USE_RIBBON ?= 1 - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -USE_PROPGRID ?= 1 - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -USE_RICHTEXT ?= 1 - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -USE_STC ?= 1 - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -USE_OPENGL ?= 1 - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -USE_QA ?= 0 - -# Enable exceptions in compiled code. [0,1] -USE_EXCEPTIONS ?= 1 - -# Enable run-time type information (RTTI) in compiled code. [0,1] -USE_RTTI ?= 1 - -# Enable threading in compiled code. [0,1] -USE_THREADS ?= 1 - -# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] -USE_CAIRO ?= 0 - -# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] -USE_GDIPLUS ?= 0 - -# Is this official build by wxWidgets developers? [0,1] -OFFICIAL_BUILD ?= 0 - -# Use this to name your customized DLLs differently -VENDOR ?= custom - -# -WX_FLAVOUR ?= - -# -WX_LIB_FLAVOUR ?= - -# 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 ?= - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -CPPUNIT_CFLAGS ?= - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -CPPUNIT_LIBS ?= - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -RUNTIME_LIBS ?= dynamic - -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer (comes with gcc3) -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION ?= 3 - +# ========================================================================= +# This configuration file was generated by +# Bakefile 0.2.8 (http://www.bakefile.org) +# Beware that all changes made to this file will be overwritten next +# time you run Bakefile! +# ========================================================================= + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# Compiler flags to link shared library +LINK_DLL_FLAGS ?= -shared + +# Compiler flags to link loadable module +LINK_MODULE_FLAGS ?= -shared + +# C compiler +CC = gcc + +# C++ compiler +CXX = g++ + +# Standard flags for CC +CFLAGS ?= + +# Standard flags for C++ +CXXFLAGS ?= + +# Standard preprocessor flags (common for CC and CXX) +CPPFLAGS ?= + +# Standard linker flags +LDFLAGS ?= + +# The C preprocessor +CPP ?= $(CC) -E + +# What type of library to build? [0,1] +SHARED ?= 0 + +# Build wxUniversal instead of native port? [0,1] +WXUNIV ?= 0 + +# Compile Unicode build of wxWidgets? [0,1] +UNICODE ?= 1 + +# Use MSLU library when building Unicode version. [0,1] +MSLU ?= 0 + +# Type of compiled binaries [debug,release] +BUILD ?= debug + +# Should debugging info be included in the executables? The default value +# "default" means that debug info will be included if BUILD=debug +# and not included if BUILD=release. [0,1,default] +DEBUG_INFO ?= default + +# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all +# but expensive assert checks are enabled, use 0 to completely remove debugging +# code. [0,1,default] +DEBUG_FLAG ?= 1 + +# Multiple libraries or single huge monolithic one? [0,1] +MONOLITHIC ?= 0 + +# Build GUI libraries? [0,1] +USE_GUI ?= 1 + +# Build wxHTML library (USE_GUI must be 1)? [0,1] +USE_HTML ?= 1 + +# Build multimedia library (USE_GUI must be 1)? [0,1] +USE_MEDIA ?= 1 + +# Build wxXRC library (USE_GUI must be 1)? [0,1] +USE_XRC ?= 1 + +# Build wxAUI library (USE_GUI must be 1)? [0,1] +USE_AUI ?= 1 + +# Build wxRibbon library (USE_GUI must be 1)? [0,1] +USE_RIBBON ?= 1 + +# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] +USE_PROPGRID ?= 1 + +# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] +USE_RICHTEXT ?= 1 + +# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] +USE_STC ?= 1 + +# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] +USE_OPENGL ?= 1 + +# Build quality assurance classes library (USE_GUI must be 1)? [0,1] +USE_QA ?= 0 + +# Enable exceptions in compiled code. [0,1] +USE_EXCEPTIONS ?= 1 + +# Enable run-time type information (RTTI) in compiled code. [0,1] +USE_RTTI ?= 1 + +# Enable threading in compiled code. [0,1] +USE_THREADS ?= 1 + +# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] +USE_CAIRO ?= 0 + +# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] +USE_GDIPLUS ?= 0 + +# Is this official build by wxWidgets developers? [0,1] +OFFICIAL_BUILD ?= 0 + +# Use this to name your customized DLLs differently +VENDOR ?= custom + +# +WX_FLAVOUR ?= + +# +WX_LIB_FLAVOUR ?= + +# 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 ?= + +# Compiler flags needed to compile test suite in tests directory. If you want +# to run the tests, set it so that the compiler can find CppUnit headers. +CPPUNIT_CFLAGS ?= + +# Linker flags needed to link test suite in tests directory. If you want +# to run the tests, include CppUnit library here. +CPPUNIT_LIBS ?= + +# Version of C runtime library to use. You can change this to +# static if SHARED=0, but it is highly recommended to not do +# it if SHARED=1 unless you know what you are doing. [dynamic,static] +RUNTIME_LIBS ?= dynamic + +# Set the version of your Mingw installation here. +# "3" ...... this is for Mingw 2.0 or newer (comes with gcc3) +# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] +GCC_VERSION ?= 3 + diff --git a/build/msw/config.vc b/build/msw/config.vc index 149f46fc64..64c21a8fb6 100644 --- a/build/msw/config.vc +++ b/build/msw/config.vc @@ -1,152 +1,152 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.8 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C compiler -CC = cl - -# C++ compiler -CXX = cl - -# Standard flags for CC -CFLAGS = - -# Standard flags for C++ -CXXFLAGS = - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = - -# Standard linker flags -LDFLAGS = - -# The C preprocessor -CPP = $(CC) /EP /nologo - -# What type of library to build? [0,1] -SHARED = 0 - -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 - -# Compile Unicode build of wxWidgets? [0,1] -UNICODE = 1 - -# Use MSLU library when building Unicode version. [0,1] -MSLU = 0 - -# Type of compiled binaries [debug,release] -BUILD = debug - -# The target processor architecture must be specified when it is not X86. -# This does not affect the compiler output, so you still need to make sure -# your environment is set up appropriately with the correct compiler in the -# PATH. Rather it affects some options passed to some of the common build -# utilities such as the resource compiler and the linker. -# -# Accepted values: AMD64, IA64. -TARGET_CPU = $(CPU) - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -DEBUG_INFO = 1 - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -DEBUG_FLAG = 1 - -# Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL? -# Default is to use debug CRT if and only if BUILD==debug. [0,1,default] -DEBUG_RUNTIME_LIBS = default - -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 0 - -# Build GUI libraries? [0,1] -USE_GUI = 1 - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -USE_HTML = 1 - -# Build multimedia library (USE_GUI must be 1)? [0,1] -USE_MEDIA = 1 - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -USE_XRC = 1 - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -USE_AUI = 1 - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -USE_RIBBON = 1 - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -USE_PROPGRID = 1 - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -USE_RICHTEXT = 1 - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -USE_STC = 1 - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -USE_OPENGL = 1 - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -USE_QA = 1 - -# Enable exceptions in compiled code. [0,1] -USE_EXCEPTIONS = 1 - -# Enable run-time type information (RTTI) in compiled code. [0,1] -USE_RTTI = 1 - -# Enable threading in compiled code. [0,1] -USE_THREADS = 1 - -# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] -USE_CAIRO = 0 - -# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] -USE_GDIPLUS = 0 - -# Is this official build by wxWidgets developers? [0,1] -OFFICIAL_BUILD = 0 - -# Use this to name your customized DLLs differently -VENDOR = custom - -# -WX_FLAVOUR = - -# -WX_LIB_FLAVOUR = - -# 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 = - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -CPPUNIT_CFLAGS = - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -CPPUNIT_LIBS = - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -RUNTIME_LIBS = dynamic - +# ========================================================================= +# This configuration file was generated by +# Bakefile 0.2.8 (http://www.bakefile.org) +# Beware that all changes made to this file will be overwritten next +# time you run Bakefile! +# ========================================================================= + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# C compiler +CC = cl + +# C++ compiler +CXX = cl + +# Standard flags for CC +CFLAGS = + +# Standard flags for C++ +CXXFLAGS = + +# Standard preprocessor flags (common for CC and CXX) +CPPFLAGS = + +# Standard linker flags +LDFLAGS = + +# The C preprocessor +CPP = $(CC) /EP /nologo + +# What type of library to build? [0,1] +SHARED = 0 + +# Build wxUniversal instead of native port? [0,1] +WXUNIV = 0 + +# Compile Unicode build of wxWidgets? [0,1] +UNICODE = 1 + +# Use MSLU library when building Unicode version. [0,1] +MSLU = 0 + +# Type of compiled binaries [debug,release] +BUILD = debug + +# The target processor architecture must be specified when it is not X86. +# This does not affect the compiler output, so you still need to make sure +# your environment is set up appropriately with the correct compiler in the +# PATH. Rather it affects some options passed to some of the common build +# utilities such as the resource compiler and the linker. +# +# Accepted values: AMD64, IA64. +TARGET_CPU = $(CPU) + +# Should debugging info be included in the executables? The default value +# "default" means that debug info will be included if BUILD=debug +# and not included if BUILD=release. [0,1,default] +DEBUG_INFO = 1 + +# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all +# but expensive assert checks are enabled, use 0 to completely remove debugging +# code. [0,1,default] +DEBUG_FLAG = 1 + +# Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL? +# Default is to use debug CRT if and only if BUILD==debug. [0,1,default] +DEBUG_RUNTIME_LIBS = default + +# Multiple libraries or single huge monolithic one? [0,1] +MONOLITHIC = 0 + +# Build GUI libraries? [0,1] +USE_GUI = 1 + +# Build wxHTML library (USE_GUI must be 1)? [0,1] +USE_HTML = 1 + +# Build multimedia library (USE_GUI must be 1)? [0,1] +USE_MEDIA = 1 + +# Build wxXRC library (USE_GUI must be 1)? [0,1] +USE_XRC = 1 + +# Build wxAUI library (USE_GUI must be 1)? [0,1] +USE_AUI = 1 + +# Build wxRibbon library (USE_GUI must be 1)? [0,1] +USE_RIBBON = 1 + +# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] +USE_PROPGRID = 1 + +# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] +USE_RICHTEXT = 1 + +# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] +USE_STC = 1 + +# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] +USE_OPENGL = 1 + +# Build quality assurance classes library (USE_GUI must be 1)? [0,1] +USE_QA = 1 + +# Enable exceptions in compiled code. [0,1] +USE_EXCEPTIONS = 1 + +# Enable run-time type information (RTTI) in compiled code. [0,1] +USE_RTTI = 1 + +# Enable threading in compiled code. [0,1] +USE_THREADS = 1 + +# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] +USE_CAIRO = 0 + +# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] +USE_GDIPLUS = 0 + +# Is this official build by wxWidgets developers? [0,1] +OFFICIAL_BUILD = 0 + +# Use this to name your customized DLLs differently +VENDOR = custom + +# +WX_FLAVOUR = + +# +WX_LIB_FLAVOUR = + +# 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 = + +# Compiler flags needed to compile test suite in tests directory. If you want +# to run the tests, set it so that the compiler can find CppUnit headers. +CPPUNIT_CFLAGS = + +# Linker flags needed to link test suite in tests directory. If you want +# to run the tests, include CppUnit library here. +CPPUNIT_LIBS = + +# Version of C runtime library to use. You can change this to +# static if SHARED=0, but it is highly recommended to not do +# it if SHARED=1 unless you know what you are doing. [dynamic,static] +RUNTIME_LIBS = dynamic + diff --git a/build/msw/config.wat b/build/msw/config.wat index 5e07695e9f..f5d58b6770 100644 --- a/build/msw/config.wat +++ b/build/msw/config.wat @@ -1,143 +1,143 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.8 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C compiler -CC = wcc386 - -# C++ compiler -CXX = wpp386 - -# Standard flags for CC -CFLAGS = - -# Standard flags for C++ -CXXFLAGS = - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = - -# Standard linker flags -LDFLAGS = - -# The C preprocessor -CPP = $(CC) -p - -# What type of library to build? [0,1] -# 1 - DLL -SHARED = 0 - -# Build wxUniversal instead of native port? [0,1] -# 1 - Universal -WXUNIV = 0 - -# Compile Unicode build of wxWidgets? [0,1] -# 1 - Unicode -UNICODE = 1 - -# Type of compiled binaries [debug,release] -BUILD = debug - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -DEBUG_INFO = default - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -DEBUG_FLAG = 1 - -# Multiple libraries or single huge monolithic one? [0,1] -# 0 - Multilib -# 1 - Monolithic -MONOLITHIC = 1 - -# Build GUI libraries? [0,1] -# 0 - Base -# 1 - GUI -USE_GUI = 1 - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -USE_HTML = 1 - -# Build multimedia library (USE_GUI must be 1)? [0,1] -USE_MEDIA = 1 - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -USE_XRC = 1 - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -USE_AUI = 1 - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -USE_RIBBON = 1 - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -USE_PROPGRID = 1 - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -USE_RICHTEXT = 1 - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -USE_STC = 1 - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -USE_OPENGL = 1 - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -USE_QA = 0 - -# Enable exceptions in compiled code. [0,1] -USE_EXCEPTIONS = 1 - -# Enable run-time type information (RTTI) in compiled code. [0,1] -USE_RTTI = 1 - -# Enable threading in compiled code. [0,1] -USE_THREADS = 1 - -# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] -USE_CAIRO = 0 - -# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] -USE_GDIPLUS = 0 - -# Is this official build by wxWidgets developers? [0,1] -OFFICIAL_BUILD = 0 - -# Use this to name your customized DLLs differently -VENDOR = custom - -# -WX_FLAVOUR = - -# -WX_LIB_FLAVOUR = - -# 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 = - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -CPPUNIT_CFLAGS = - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -CPPUNIT_LIBS = - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -RUNTIME_LIBS = dynamic - +# ========================================================================= +# This configuration file was generated by +# Bakefile 0.2.8 (http://www.bakefile.org) +# Beware that all changes made to this file will be overwritten next +# time you run Bakefile! +# ========================================================================= + + +# ------------------------------------------------------------------------- +# These are configurable options: +# ------------------------------------------------------------------------- + +# C compiler +CC = wcc386 + +# C++ compiler +CXX = wpp386 + +# Standard flags for CC +CFLAGS = + +# Standard flags for C++ +CXXFLAGS = + +# Standard preprocessor flags (common for CC and CXX) +CPPFLAGS = + +# Standard linker flags +LDFLAGS = + +# The C preprocessor +CPP = $(CC) -p + +# What type of library to build? [0,1] +# 1 - DLL +SHARED = 0 + +# Build wxUniversal instead of native port? [0,1] +# 1 - Universal +WXUNIV = 0 + +# Compile Unicode build of wxWidgets? [0,1] +# 1 - Unicode +UNICODE = 1 + +# Type of compiled binaries [debug,release] +BUILD = debug + +# Should debugging info be included in the executables? The default value +# "default" means that debug info will be included if BUILD=debug +# and not included if BUILD=release. [0,1,default] +DEBUG_INFO = default + +# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all +# but expensive assert checks are enabled, use 0 to completely remove debugging +# code. [0,1,default] +DEBUG_FLAG = 1 + +# Multiple libraries or single huge monolithic one? [0,1] +# 0 - Multilib +# 1 - Monolithic +MONOLITHIC = 1 + +# Build GUI libraries? [0,1] +# 0 - Base +# 1 - GUI +USE_GUI = 1 + +# Build wxHTML library (USE_GUI must be 1)? [0,1] +USE_HTML = 1 + +# Build multimedia library (USE_GUI must be 1)? [0,1] +USE_MEDIA = 1 + +# Build wxXRC library (USE_GUI must be 1)? [0,1] +USE_XRC = 1 + +# Build wxAUI library (USE_GUI must be 1)? [0,1] +USE_AUI = 1 + +# Build wxRibbon library (USE_GUI must be 1)? [0,1] +USE_RIBBON = 1 + +# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] +USE_PROPGRID = 1 + +# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] +USE_RICHTEXT = 1 + +# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] +USE_STC = 1 + +# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] +USE_OPENGL = 1 + +# Build quality assurance classes library (USE_GUI must be 1)? [0,1] +USE_QA = 0 + +# Enable exceptions in compiled code. [0,1] +USE_EXCEPTIONS = 1 + +# Enable run-time type information (RTTI) in compiled code. [0,1] +USE_RTTI = 1 + +# Enable threading in compiled code. [0,1] +USE_THREADS = 1 + +# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] +USE_CAIRO = 0 + +# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1] +USE_GDIPLUS = 0 + +# Is this official build by wxWidgets developers? [0,1] +OFFICIAL_BUILD = 0 + +# Use this to name your customized DLLs differently +VENDOR = custom + +# +WX_FLAVOUR = + +# +WX_LIB_FLAVOUR = + +# 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 = + +# Compiler flags needed to compile test suite in tests directory. If you want +# to run the tests, set it so that the compiler can find CppUnit headers. +CPPUNIT_CFLAGS = + +# Linker flags needed to link test suite in tests directory. If you want +# to run the tests, include CppUnit library here. +CPPUNIT_LIBS = + +# Version of C runtime library to use. You can change this to +# static if SHARED=0, but it is highly recommended to not do +# it if SHARED=1 unless you know what you are doing. [dynamic,static] +RUNTIME_LIBS = dynamic + diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 09309b7893..646e976648 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1815,13 +1815,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_listctrlcmn.obj \ $(OBJS)\monodll_matrix.obj \ $(OBJS)\monodll_menucmn.obj \ - $(OBJS)\monodll_mousemanager.obj \ - $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_overlaycmn.obj \ - $(OBJS)\monodll_ownerdrwcmn.obj \ - $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_persist.obj \ - $(OBJS)\monodll_pickerbase.obj \ + $(OBJS)\monodll_mousemanager.obj \ + $(OBJS)\monodll_nbkbase.obj \ + $(OBJS)\monodll_overlaycmn.obj \ + $(OBJS)\monodll_ownerdrwcmn.obj \ + $(OBJS)\monodll_paper.obj \ + $(OBJS)\monodll_persist.obj \ + $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ @@ -2058,13 +2058,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_listctrlcmn.obj \ $(OBJS)\monodll_matrix.obj \ $(OBJS)\monodll_menucmn.obj \ - $(OBJS)\monodll_mousemanager.obj \ - $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_overlaycmn.obj \ - $(OBJS)\monodll_ownerdrwcmn.obj \ - $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_persist.obj \ - $(OBJS)\monodll_pickerbase.obj \ + $(OBJS)\monodll_mousemanager.obj \ + $(OBJS)\monodll_nbkbase.obj \ + $(OBJS)\monodll_overlaycmn.obj \ + $(OBJS)\monodll_ownerdrwcmn.obj \ + $(OBJS)\monodll_paper.obj \ + $(OBJS)\monodll_persist.obj \ + $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ @@ -2517,13 +2517,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_listctrlcmn.obj \ $(OBJS)\monolib_matrix.obj \ $(OBJS)\monolib_menucmn.obj \ - $(OBJS)\monolib_mousemanager.obj \ - $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_overlaycmn.obj \ - $(OBJS)\monolib_ownerdrwcmn.obj \ - $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_persist.obj \ - $(OBJS)\monolib_pickerbase.obj \ + $(OBJS)\monolib_mousemanager.obj \ + $(OBJS)\monolib_nbkbase.obj \ + $(OBJS)\monolib_overlaycmn.obj \ + $(OBJS)\monolib_ownerdrwcmn.obj \ + $(OBJS)\monolib_paper.obj \ + $(OBJS)\monolib_persist.obj \ + $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ @@ -2760,13 +2760,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_listctrlcmn.obj \ $(OBJS)\monolib_matrix.obj \ $(OBJS)\monolib_menucmn.obj \ - $(OBJS)\monolib_mousemanager.obj \ - $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_overlaycmn.obj \ - $(OBJS)\monolib_ownerdrwcmn.obj \ - $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_persist.obj \ - $(OBJS)\monolib_pickerbase.obj \ + $(OBJS)\monolib_mousemanager.obj \ + $(OBJS)\monolib_nbkbase.obj \ + $(OBJS)\monolib_overlaycmn.obj \ + $(OBJS)\monolib_ownerdrwcmn.obj \ + $(OBJS)\monolib_paper.obj \ + $(OBJS)\monolib_persist.obj \ + $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ @@ -3112,13 +3112,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_listctrlcmn.obj \ $(OBJS)\coredll_matrix.obj \ $(OBJS)\coredll_menucmn.obj \ - $(OBJS)\coredll_mousemanager.obj \ - $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_overlaycmn.obj \ - $(OBJS)\coredll_ownerdrwcmn.obj \ - $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_persist.obj \ - $(OBJS)\coredll_pickerbase.obj \ + $(OBJS)\coredll_mousemanager.obj \ + $(OBJS)\coredll_nbkbase.obj \ + $(OBJS)\coredll_overlaycmn.obj \ + $(OBJS)\coredll_ownerdrwcmn.obj \ + $(OBJS)\coredll_paper.obj \ + $(OBJS)\coredll_persist.obj \ + $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ @@ -3355,13 +3355,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_listctrlcmn.obj \ $(OBJS)\coredll_matrix.obj \ $(OBJS)\coredll_menucmn.obj \ - $(OBJS)\coredll_mousemanager.obj \ - $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_overlaycmn.obj \ - $(OBJS)\coredll_ownerdrwcmn.obj \ - $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_persist.obj \ - $(OBJS)\coredll_pickerbase.obj \ + $(OBJS)\coredll_mousemanager.obj \ + $(OBJS)\coredll_nbkbase.obj \ + $(OBJS)\coredll_overlaycmn.obj \ + $(OBJS)\coredll_ownerdrwcmn.obj \ + $(OBJS)\coredll_paper.obj \ + $(OBJS)\coredll_persist.obj \ + $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ @@ -3603,13 +3603,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_listctrlcmn.obj \ $(OBJS)\corelib_matrix.obj \ $(OBJS)\corelib_menucmn.obj \ - $(OBJS)\corelib_mousemanager.obj \ - $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_overlaycmn.obj \ - $(OBJS)\corelib_ownerdrwcmn.obj \ - $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_persist.obj \ - $(OBJS)\corelib_pickerbase.obj \ + $(OBJS)\corelib_mousemanager.obj \ + $(OBJS)\corelib_nbkbase.obj \ + $(OBJS)\corelib_overlaycmn.obj \ + $(OBJS)\corelib_ownerdrwcmn.obj \ + $(OBJS)\corelib_paper.obj \ + $(OBJS)\corelib_persist.obj \ + $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ @@ -3846,13 +3846,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_listctrlcmn.obj \ $(OBJS)\corelib_matrix.obj \ $(OBJS)\corelib_menucmn.obj \ - $(OBJS)\corelib_mousemanager.obj \ - $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_overlaycmn.obj \ - $(OBJS)\corelib_ownerdrwcmn.obj \ - $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_persist.obj \ - $(OBJS)\corelib_pickerbase.obj \ + $(OBJS)\corelib_mousemanager.obj \ + $(OBJS)\corelib_nbkbase.obj \ + $(OBJS)\corelib_overlaycmn.obj \ + $(OBJS)\corelib_ownerdrwcmn.obj \ + $(OBJS)\corelib_paper.obj \ + $(OBJS)\corelib_persist.obj \ + $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ @@ -7312,17 +7312,17 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp !if "$(USE_GUI)" == "1" $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp -!endif +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp @@ -9494,17 +9494,17 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp !if "$(USE_GUI)" == "1" $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp -!endif +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp @@ -11679,17 +11679,17 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp !if "$(USE_GUI)" == "1" $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp -!endif +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp +!endif !if "$(USE_GUI)" == "1" $(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp @@ -12958,17 +12958,17 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp !if "$(USE_GUI)" == "1" $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp -!endif +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp +!endif !if "$(USE_GUI)" == "1" $(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 0a669584c0..74d355a568 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1842,13 +1842,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_listctrlcmn.o \ $(OBJS)\monodll_matrix.o \ $(OBJS)\monodll_menucmn.o \ - $(OBJS)\monodll_mousemanager.o \ - $(OBJS)\monodll_nbkbase.o \ - $(OBJS)\monodll_overlaycmn.o \ - $(OBJS)\monodll_ownerdrwcmn.o \ - $(OBJS)\monodll_paper.o \ - $(OBJS)\monodll_persist.o \ - $(OBJS)\monodll_pickerbase.o \ + $(OBJS)\monodll_mousemanager.o \ + $(OBJS)\monodll_nbkbase.o \ + $(OBJS)\monodll_overlaycmn.o \ + $(OBJS)\monodll_ownerdrwcmn.o \ + $(OBJS)\monodll_paper.o \ + $(OBJS)\monodll_persist.o \ + $(OBJS)\monodll_pickerbase.o \ $(OBJS)\monodll_popupcmn.o \ $(OBJS)\monodll_prntbase.o \ $(OBJS)\monodll_quantize.o \ @@ -2087,13 +2087,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_listctrlcmn.o \ $(OBJS)\monodll_matrix.o \ $(OBJS)\monodll_menucmn.o \ - $(OBJS)\monodll_mousemanager.o \ - $(OBJS)\monodll_nbkbase.o \ - $(OBJS)\monodll_overlaycmn.o \ - $(OBJS)\monodll_ownerdrwcmn.o \ - $(OBJS)\monodll_paper.o \ - $(OBJS)\monodll_persist.o \ - $(OBJS)\monodll_pickerbase.o \ + $(OBJS)\monodll_mousemanager.o \ + $(OBJS)\monodll_nbkbase.o \ + $(OBJS)\monodll_overlaycmn.o \ + $(OBJS)\monodll_ownerdrwcmn.o \ + $(OBJS)\monodll_paper.o \ + $(OBJS)\monodll_persist.o \ + $(OBJS)\monodll_pickerbase.o \ $(OBJS)\monodll_popupcmn.o \ $(OBJS)\monodll_prntbase.o \ $(OBJS)\monodll_quantize.o \ @@ -2550,13 +2550,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_listctrlcmn.o \ $(OBJS)\monolib_matrix.o \ $(OBJS)\monolib_menucmn.o \ - $(OBJS)\monolib_mousemanager.o \ - $(OBJS)\monolib_nbkbase.o \ - $(OBJS)\monolib_overlaycmn.o \ - $(OBJS)\monolib_ownerdrwcmn.o \ - $(OBJS)\monolib_paper.o \ - $(OBJS)\monolib_persist.o \ - $(OBJS)\monolib_pickerbase.o \ + $(OBJS)\monolib_mousemanager.o \ + $(OBJS)\monolib_nbkbase.o \ + $(OBJS)\monolib_overlaycmn.o \ + $(OBJS)\monolib_ownerdrwcmn.o \ + $(OBJS)\monolib_paper.o \ + $(OBJS)\monolib_persist.o \ + $(OBJS)\monolib_pickerbase.o \ $(OBJS)\monolib_popupcmn.o \ $(OBJS)\monolib_prntbase.o \ $(OBJS)\monolib_quantize.o \ @@ -2795,13 +2795,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_listctrlcmn.o \ $(OBJS)\monolib_matrix.o \ $(OBJS)\monolib_menucmn.o \ - $(OBJS)\monolib_mousemanager.o \ - $(OBJS)\monolib_nbkbase.o \ - $(OBJS)\monolib_overlaycmn.o \ - $(OBJS)\monolib_ownerdrwcmn.o \ - $(OBJS)\monolib_paper.o \ - $(OBJS)\monolib_persist.o \ - $(OBJS)\monolib_pickerbase.o \ + $(OBJS)\monolib_mousemanager.o \ + $(OBJS)\monolib_nbkbase.o \ + $(OBJS)\monolib_overlaycmn.o \ + $(OBJS)\monolib_ownerdrwcmn.o \ + $(OBJS)\monolib_paper.o \ + $(OBJS)\monolib_persist.o \ + $(OBJS)\monolib_pickerbase.o \ $(OBJS)\monolib_popupcmn.o \ $(OBJS)\monolib_prntbase.o \ $(OBJS)\monolib_quantize.o \ @@ -3161,13 +3161,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_listctrlcmn.o \ $(OBJS)\coredll_matrix.o \ $(OBJS)\coredll_menucmn.o \ - $(OBJS)\coredll_mousemanager.o \ - $(OBJS)\coredll_nbkbase.o \ - $(OBJS)\coredll_overlaycmn.o \ - $(OBJS)\coredll_ownerdrwcmn.o \ - $(OBJS)\coredll_paper.o \ - $(OBJS)\coredll_persist.o \ - $(OBJS)\coredll_pickerbase.o \ + $(OBJS)\coredll_mousemanager.o \ + $(OBJS)\coredll_nbkbase.o \ + $(OBJS)\coredll_overlaycmn.o \ + $(OBJS)\coredll_ownerdrwcmn.o \ + $(OBJS)\coredll_paper.o \ + $(OBJS)\coredll_persist.o \ + $(OBJS)\coredll_pickerbase.o \ $(OBJS)\coredll_popupcmn.o \ $(OBJS)\coredll_prntbase.o \ $(OBJS)\coredll_quantize.o \ @@ -3406,13 +3406,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_listctrlcmn.o \ $(OBJS)\coredll_matrix.o \ $(OBJS)\coredll_menucmn.o \ - $(OBJS)\coredll_mousemanager.o \ - $(OBJS)\coredll_nbkbase.o \ - $(OBJS)\coredll_overlaycmn.o \ - $(OBJS)\coredll_ownerdrwcmn.o \ - $(OBJS)\coredll_paper.o \ - $(OBJS)\coredll_persist.o \ - $(OBJS)\coredll_pickerbase.o \ + $(OBJS)\coredll_mousemanager.o \ + $(OBJS)\coredll_nbkbase.o \ + $(OBJS)\coredll_overlaycmn.o \ + $(OBJS)\coredll_ownerdrwcmn.o \ + $(OBJS)\coredll_paper.o \ + $(OBJS)\coredll_persist.o \ + $(OBJS)\coredll_pickerbase.o \ $(OBJS)\coredll_popupcmn.o \ $(OBJS)\coredll_prntbase.o \ $(OBJS)\coredll_quantize.o \ @@ -3660,13 +3660,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_listctrlcmn.o \ $(OBJS)\corelib_matrix.o \ $(OBJS)\corelib_menucmn.o \ - $(OBJS)\corelib_mousemanager.o \ - $(OBJS)\corelib_nbkbase.o \ - $(OBJS)\corelib_overlaycmn.o \ - $(OBJS)\corelib_ownerdrwcmn.o \ - $(OBJS)\corelib_paper.o \ - $(OBJS)\corelib_persist.o \ - $(OBJS)\corelib_pickerbase.o \ + $(OBJS)\corelib_mousemanager.o \ + $(OBJS)\corelib_nbkbase.o \ + $(OBJS)\corelib_overlaycmn.o \ + $(OBJS)\corelib_ownerdrwcmn.o \ + $(OBJS)\corelib_paper.o \ + $(OBJS)\corelib_persist.o \ + $(OBJS)\corelib_pickerbase.o \ $(OBJS)\corelib_popupcmn.o \ $(OBJS)\corelib_prntbase.o \ $(OBJS)\corelib_quantize.o \ @@ -3905,13 +3905,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_listctrlcmn.o \ $(OBJS)\corelib_matrix.o \ $(OBJS)\corelib_menucmn.o \ - $(OBJS)\corelib_mousemanager.o \ - $(OBJS)\corelib_nbkbase.o \ - $(OBJS)\corelib_overlaycmn.o \ - $(OBJS)\corelib_ownerdrwcmn.o \ - $(OBJS)\corelib_paper.o \ - $(OBJS)\corelib_persist.o \ - $(OBJS)\corelib_pickerbase.o \ + $(OBJS)\corelib_mousemanager.o \ + $(OBJS)\corelib_nbkbase.o \ + $(OBJS)\corelib_overlaycmn.o \ + $(OBJS)\corelib_ownerdrwcmn.o \ + $(OBJS)\corelib_paper.o \ + $(OBJS)\corelib_persist.o \ + $(OBJS)\corelib_pickerbase.o \ $(OBJS)\corelib_popupcmn.o \ $(OBJS)\corelib_prntbase.o \ $(OBJS)\corelib_quantize.o \ @@ -7478,17 +7478,17 @@ endif ifeq ($(USE_GUI),1) $(OBJS)\monodll_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_paper.o: ../../src/common/paper.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_paper.o: ../../src/common/paper.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\monodll_persist.o: ../../src/common/persist.cpp @@ -9660,17 +9660,17 @@ endif ifeq ($(USE_GUI),1) $(OBJS)\monolib_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_paper.o: ../../src/common/paper.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_paper.o: ../../src/common/paper.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\monolib_persist.o: ../../src/common/persist.cpp @@ -11845,17 +11845,17 @@ endif ifeq ($(USE_GUI),1) $(OBJS)\coredll_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_paper.o: ../../src/common/paper.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_paper.o: ../../src/common/paper.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\coredll_persist.o: ../../src/common/persist.cpp @@ -13124,17 +13124,17 @@ endif ifeq ($(USE_GUI),1) $(OBJS)\corelib_overlaycmn.o: ../../src/common/overlaycmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_paper.o: ../../src/common/paper.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_paper.o: ../../src/common/paper.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif ifeq ($(USE_GUI),1) $(OBJS)\corelib_persist.o: ../../src/common/persist.cpp diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 9ec758c9b5..1f22ad112e 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -2040,13 +2040,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_listctrlcmn.obj \ $(OBJS)\monodll_matrix.obj \ $(OBJS)\monodll_menucmn.obj \ - $(OBJS)\monodll_mousemanager.obj \ - $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_overlaycmn.obj \ - $(OBJS)\monodll_ownerdrwcmn.obj \ - $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_persist.obj \ - $(OBJS)\monodll_pickerbase.obj \ + $(OBJS)\monodll_mousemanager.obj \ + $(OBJS)\monodll_nbkbase.obj \ + $(OBJS)\monodll_overlaycmn.obj \ + $(OBJS)\monodll_ownerdrwcmn.obj \ + $(OBJS)\monodll_paper.obj \ + $(OBJS)\monodll_persist.obj \ + $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ @@ -2283,13 +2283,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_listctrlcmn.obj \ $(OBJS)\monodll_matrix.obj \ $(OBJS)\monodll_menucmn.obj \ - $(OBJS)\monodll_mousemanager.obj \ - $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_overlaycmn.obj \ - $(OBJS)\monodll_ownerdrwcmn.obj \ - $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_persist.obj \ - $(OBJS)\monodll_pickerbase.obj \ + $(OBJS)\monodll_mousemanager.obj \ + $(OBJS)\monodll_nbkbase.obj \ + $(OBJS)\monodll_overlaycmn.obj \ + $(OBJS)\monodll_ownerdrwcmn.obj \ + $(OBJS)\monodll_paper.obj \ + $(OBJS)\monodll_persist.obj \ + $(OBJS)\monodll_pickerbase.obj \ $(OBJS)\monodll_popupcmn.obj \ $(OBJS)\monodll_prntbase.obj \ $(OBJS)\monodll_quantize.obj \ @@ -2748,13 +2748,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_listctrlcmn.obj \ $(OBJS)\monolib_matrix.obj \ $(OBJS)\monolib_menucmn.obj \ - $(OBJS)\monolib_mousemanager.obj \ - $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_overlaycmn.obj \ - $(OBJS)\monolib_ownerdrwcmn.obj \ - $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_persist.obj \ - $(OBJS)\monolib_pickerbase.obj \ + $(OBJS)\monolib_mousemanager.obj \ + $(OBJS)\monolib_nbkbase.obj \ + $(OBJS)\monolib_overlaycmn.obj \ + $(OBJS)\monolib_ownerdrwcmn.obj \ + $(OBJS)\monolib_paper.obj \ + $(OBJS)\monolib_persist.obj \ + $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ @@ -2991,13 +2991,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_listctrlcmn.obj \ $(OBJS)\monolib_matrix.obj \ $(OBJS)\monolib_menucmn.obj \ - $(OBJS)\monolib_mousemanager.obj \ - $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_overlaycmn.obj \ - $(OBJS)\monolib_ownerdrwcmn.obj \ - $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_persist.obj \ - $(OBJS)\monolib_pickerbase.obj \ + $(OBJS)\monolib_mousemanager.obj \ + $(OBJS)\monolib_nbkbase.obj \ + $(OBJS)\monolib_overlaycmn.obj \ + $(OBJS)\monolib_ownerdrwcmn.obj \ + $(OBJS)\monolib_paper.obj \ + $(OBJS)\monolib_persist.obj \ + $(OBJS)\monolib_pickerbase.obj \ $(OBJS)\monolib_popupcmn.obj \ $(OBJS)\monolib_prntbase.obj \ $(OBJS)\monolib_quantize.obj \ @@ -3409,13 +3409,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_listctrlcmn.obj \ $(OBJS)\coredll_matrix.obj \ $(OBJS)\coredll_menucmn.obj \ - $(OBJS)\coredll_mousemanager.obj \ - $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_overlaycmn.obj \ - $(OBJS)\coredll_ownerdrwcmn.obj \ - $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_persist.obj \ - $(OBJS)\coredll_pickerbase.obj \ + $(OBJS)\coredll_mousemanager.obj \ + $(OBJS)\coredll_nbkbase.obj \ + $(OBJS)\coredll_overlaycmn.obj \ + $(OBJS)\coredll_ownerdrwcmn.obj \ + $(OBJS)\coredll_paper.obj \ + $(OBJS)\coredll_persist.obj \ + $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ @@ -3652,13 +3652,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_listctrlcmn.obj \ $(OBJS)\coredll_matrix.obj \ $(OBJS)\coredll_menucmn.obj \ - $(OBJS)\coredll_mousemanager.obj \ - $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_overlaycmn.obj \ - $(OBJS)\coredll_ownerdrwcmn.obj \ - $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_persist.obj \ - $(OBJS)\coredll_pickerbase.obj \ + $(OBJS)\coredll_mousemanager.obj \ + $(OBJS)\coredll_nbkbase.obj \ + $(OBJS)\coredll_overlaycmn.obj \ + $(OBJS)\coredll_ownerdrwcmn.obj \ + $(OBJS)\coredll_paper.obj \ + $(OBJS)\coredll_persist.obj \ + $(OBJS)\coredll_pickerbase.obj \ $(OBJS)\coredll_popupcmn.obj \ $(OBJS)\coredll_prntbase.obj \ $(OBJS)\coredll_quantize.obj \ @@ -3906,13 +3906,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_listctrlcmn.obj \ $(OBJS)\corelib_matrix.obj \ $(OBJS)\corelib_menucmn.obj \ - $(OBJS)\corelib_mousemanager.obj \ - $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_overlaycmn.obj \ - $(OBJS)\corelib_ownerdrwcmn.obj \ - $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_persist.obj \ - $(OBJS)\corelib_pickerbase.obj \ + $(OBJS)\corelib_mousemanager.obj \ + $(OBJS)\corelib_nbkbase.obj \ + $(OBJS)\corelib_overlaycmn.obj \ + $(OBJS)\corelib_ownerdrwcmn.obj \ + $(OBJS)\corelib_paper.obj \ + $(OBJS)\corelib_persist.obj \ + $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ @@ -4149,13 +4149,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_listctrlcmn.obj \ $(OBJS)\corelib_matrix.obj \ $(OBJS)\corelib_menucmn.obj \ - $(OBJS)\corelib_mousemanager.obj \ - $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_overlaycmn.obj \ - $(OBJS)\corelib_ownerdrwcmn.obj \ - $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_persist.obj \ - $(OBJS)\corelib_pickerbase.obj \ + $(OBJS)\corelib_mousemanager.obj \ + $(OBJS)\corelib_nbkbase.obj \ + $(OBJS)\corelib_overlaycmn.obj \ + $(OBJS)\corelib_ownerdrwcmn.obj \ + $(OBJS)\corelib_paper.obj \ + $(OBJS)\corelib_persist.obj \ + $(OBJS)\corelib_pickerbase.obj \ $(OBJS)\corelib_popupcmn.obj \ $(OBJS)\corelib_prntbase.obj \ $(OBJS)\corelib_quantize.obj \ @@ -7909,17 +7909,17 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp !if "$(USE_GUI)" == "1" $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp -!endif +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp @@ -10091,17 +10091,17 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp !if "$(USE_GUI)" == "1" $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp -!endif +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp +!endif !if "$(USE_GUI)" == "1" $(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp @@ -12276,17 +12276,17 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp !if "$(USE_GUI)" == "1" $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp -!endif +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp +!endif !if "$(USE_GUI)" == "1" $(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp @@ -13555,17 +13555,17 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp !if "$(USE_GUI)" == "1" $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp -!endif +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp +!endif + +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp +!endif !if "$(USE_GUI)" == "1" $(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index fcf8be5add..62089c5505 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -408,13 +408,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_listctrlcmn.obj & $(OBJS)\monodll_matrix.obj & $(OBJS)\monodll_menucmn.obj & - $(OBJS)\monodll_mousemanager.obj & - $(OBJS)\monodll_nbkbase.obj & - $(OBJS)\monodll_overlaycmn.obj & - $(OBJS)\monodll_ownerdrwcmn.obj & - $(OBJS)\monodll_paper.obj & - $(OBJS)\monodll_persist.obj & - $(OBJS)\monodll_pickerbase.obj & + $(OBJS)\monodll_mousemanager.obj & + $(OBJS)\monodll_nbkbase.obj & + $(OBJS)\monodll_overlaycmn.obj & + $(OBJS)\monodll_ownerdrwcmn.obj & + $(OBJS)\monodll_paper.obj & + $(OBJS)\monodll_persist.obj & + $(OBJS)\monodll_pickerbase.obj & $(OBJS)\monodll_popupcmn.obj & $(OBJS)\monodll_prntbase.obj & $(OBJS)\monodll_quantize.obj & @@ -653,13 +653,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_listctrlcmn.obj & $(OBJS)\monodll_matrix.obj & $(OBJS)\monodll_menucmn.obj & - $(OBJS)\monodll_mousemanager.obj & - $(OBJS)\monodll_nbkbase.obj & - $(OBJS)\monodll_overlaycmn.obj & - $(OBJS)\monodll_ownerdrwcmn.obj & - $(OBJS)\monodll_paper.obj & - $(OBJS)\monodll_persist.obj & - $(OBJS)\monodll_pickerbase.obj & + $(OBJS)\monodll_mousemanager.obj & + $(OBJS)\monodll_nbkbase.obj & + $(OBJS)\monodll_overlaycmn.obj & + $(OBJS)\monodll_ownerdrwcmn.obj & + $(OBJS)\monodll_paper.obj & + $(OBJS)\monodll_persist.obj & + $(OBJS)\monodll_pickerbase.obj & $(OBJS)\monodll_popupcmn.obj & $(OBJS)\monodll_prntbase.obj & $(OBJS)\monodll_quantize.obj & @@ -1121,13 +1121,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_listctrlcmn.obj & $(OBJS)\monolib_matrix.obj & $(OBJS)\monolib_menucmn.obj & - $(OBJS)\monolib_mousemanager.obj & - $(OBJS)\monolib_nbkbase.obj & - $(OBJS)\monolib_overlaycmn.obj & - $(OBJS)\monolib_ownerdrwcmn.obj & - $(OBJS)\monolib_paper.obj & - $(OBJS)\monolib_persist.obj & - $(OBJS)\monolib_pickerbase.obj & + $(OBJS)\monolib_mousemanager.obj & + $(OBJS)\monolib_nbkbase.obj & + $(OBJS)\monolib_overlaycmn.obj & + $(OBJS)\monolib_ownerdrwcmn.obj & + $(OBJS)\monolib_paper.obj & + $(OBJS)\monolib_persist.obj & + $(OBJS)\monolib_pickerbase.obj & $(OBJS)\monolib_popupcmn.obj & $(OBJS)\monolib_prntbase.obj & $(OBJS)\monolib_quantize.obj & @@ -1366,13 +1366,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_listctrlcmn.obj & $(OBJS)\monolib_matrix.obj & $(OBJS)\monolib_menucmn.obj & - $(OBJS)\monolib_mousemanager.obj & - $(OBJS)\monolib_nbkbase.obj & - $(OBJS)\monolib_overlaycmn.obj & - $(OBJS)\monolib_ownerdrwcmn.obj & - $(OBJS)\monolib_paper.obj & - $(OBJS)\monolib_persist.obj & - $(OBJS)\monolib_pickerbase.obj & + $(OBJS)\monolib_mousemanager.obj & + $(OBJS)\monolib_nbkbase.obj & + $(OBJS)\monolib_overlaycmn.obj & + $(OBJS)\monolib_ownerdrwcmn.obj & + $(OBJS)\monolib_paper.obj & + $(OBJS)\monolib_persist.obj & + $(OBJS)\monolib_pickerbase.obj & $(OBJS)\monolib_popupcmn.obj & $(OBJS)\monolib_prntbase.obj & $(OBJS)\monolib_quantize.obj & @@ -1743,13 +1743,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_listctrlcmn.obj & $(OBJS)\coredll_matrix.obj & $(OBJS)\coredll_menucmn.obj & - $(OBJS)\coredll_mousemanager.obj & - $(OBJS)\coredll_nbkbase.obj & - $(OBJS)\coredll_overlaycmn.obj & - $(OBJS)\coredll_ownerdrwcmn.obj & - $(OBJS)\coredll_paper.obj & - $(OBJS)\coredll_persist.obj & - $(OBJS)\coredll_pickerbase.obj & + $(OBJS)\coredll_mousemanager.obj & + $(OBJS)\coredll_nbkbase.obj & + $(OBJS)\coredll_overlaycmn.obj & + $(OBJS)\coredll_ownerdrwcmn.obj & + $(OBJS)\coredll_paper.obj & + $(OBJS)\coredll_persist.obj & + $(OBJS)\coredll_pickerbase.obj & $(OBJS)\coredll_popupcmn.obj & $(OBJS)\coredll_prntbase.obj & $(OBJS)\coredll_quantize.obj & @@ -1988,13 +1988,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_listctrlcmn.obj & $(OBJS)\coredll_matrix.obj & $(OBJS)\coredll_menucmn.obj & - $(OBJS)\coredll_mousemanager.obj & - $(OBJS)\coredll_nbkbase.obj & - $(OBJS)\coredll_overlaycmn.obj & - $(OBJS)\coredll_ownerdrwcmn.obj & - $(OBJS)\coredll_paper.obj & - $(OBJS)\coredll_persist.obj & - $(OBJS)\coredll_pickerbase.obj & + $(OBJS)\coredll_mousemanager.obj & + $(OBJS)\coredll_nbkbase.obj & + $(OBJS)\coredll_overlaycmn.obj & + $(OBJS)\coredll_ownerdrwcmn.obj & + $(OBJS)\coredll_paper.obj & + $(OBJS)\coredll_persist.obj & + $(OBJS)\coredll_pickerbase.obj & $(OBJS)\coredll_popupcmn.obj & $(OBJS)\coredll_prntbase.obj & $(OBJS)\coredll_quantize.obj & @@ -2244,13 +2244,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_listctrlcmn.obj & $(OBJS)\corelib_matrix.obj & $(OBJS)\corelib_menucmn.obj & - $(OBJS)\corelib_mousemanager.obj & - $(OBJS)\corelib_nbkbase.obj & - $(OBJS)\corelib_overlaycmn.obj & - $(OBJS)\corelib_ownerdrwcmn.obj & - $(OBJS)\corelib_paper.obj & - $(OBJS)\corelib_persist.obj & - $(OBJS)\corelib_pickerbase.obj & + $(OBJS)\corelib_mousemanager.obj & + $(OBJS)\corelib_nbkbase.obj & + $(OBJS)\corelib_overlaycmn.obj & + $(OBJS)\corelib_ownerdrwcmn.obj & + $(OBJS)\corelib_paper.obj & + $(OBJS)\corelib_persist.obj & + $(OBJS)\corelib_pickerbase.obj & $(OBJS)\corelib_popupcmn.obj & $(OBJS)\corelib_prntbase.obj & $(OBJS)\corelib_quantize.obj & @@ -2489,13 +2489,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_listctrlcmn.obj & $(OBJS)\corelib_matrix.obj & $(OBJS)\corelib_menucmn.obj & - $(OBJS)\corelib_mousemanager.obj & - $(OBJS)\corelib_nbkbase.obj & - $(OBJS)\corelib_overlaycmn.obj & - $(OBJS)\corelib_ownerdrwcmn.obj & - $(OBJS)\corelib_paper.obj & - $(OBJS)\corelib_persist.obj & - $(OBJS)\corelib_pickerbase.obj & + $(OBJS)\corelib_mousemanager.obj & + $(OBJS)\corelib_nbkbase.obj & + $(OBJS)\corelib_overlaycmn.obj & + $(OBJS)\corelib_ownerdrwcmn.obj & + $(OBJS)\corelib_paper.obj & + $(OBJS)\corelib_persist.obj & + $(OBJS)\corelib_pickerbase.obj & $(OBJS)\corelib_popupcmn.obj & $(OBJS)\corelib_prntbase.obj & $(OBJS)\corelib_quantize.obj & @@ -7737,17 +7737,17 @@ $(OBJS)\monodll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp !ifeq USE_GUI 1 $(OBJS)\monodll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monodll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\monodll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp @@ -9919,17 +9919,17 @@ $(OBJS)\monolib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp !ifeq USE_GUI 1 $(OBJS)\monolib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\monolib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\monolib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp @@ -12104,17 +12104,17 @@ $(OBJS)\coredll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp !ifeq USE_GUI 1 $(OBJS)\coredll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\coredll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\coredll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp @@ -13383,17 +13383,17 @@ $(OBJS)\corelib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp !ifeq USE_GUI 1 $(OBJS)\corelib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + +!ifeq USE_GUI 1 +$(OBJS)\corelib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif !ifeq USE_GUI 1 $(OBJS)\corelib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index 51daa5b9d6..018da58d55 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -1219,6 +1219,10 @@ SOURCE=..\..\include\wx\event.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\evtloop.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\except.h # End Source File # Begin Source File diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index d72ce20ed2..4a4eb9d38b 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -562,10 +562,10 @@ SOURCE=..\..\src\common\overlaycmn.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\ownerdrwcmn.cpp -# End Source File -# Begin Source File - +SOURCE=..\..\src\common\ownerdrwcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\paper.cpp # End Source File # Begin Source File @@ -5075,10 +5075,10 @@ SOURCE=..\..\include\wx\msw\ole\oleutils.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\ownerdrw.h -# End Source File -# Begin Source File - +SOURCE=..\..\include\wx\msw\ownerdrw.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\palette.h # End Source File # Begin Source File @@ -5967,10 +5967,6 @@ SOURCE=..\..\include\wx\encinfo.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\evtloop.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\evtloopsrc.h # End Source File # Begin Source File diff --git a/build/msw/wx_vc7_base.vcproj b/build/msw/wx_vc7_base.vcproj index a6c458589b..330fd23a28 100644 --- a/build/msw/wx_vc7_base.vcproj +++ b/build/msw/wx_vc7_base.vcproj @@ -1346,6 +1346,9 @@ + + diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj index 49348c7a7a..f90ff7608e 100644 --- a/build/msw/wx_vc7_core.vcproj +++ b/build/msw/wx_vc7_core.vcproj @@ -814,9 +814,9 @@ RelativePath="..\..\src\common\overlaycmn.cpp"> - - + + - - + + - - diff --git a/build/msw/wx_vc7_wxtiff.vcproj b/build/msw/wx_vc7_wxtiff.vcproj index 7fc30c7f28..740982de6d 100644 --- a/build/msw/wx_vc7_wxtiff.vcproj +++ b/build/msw/wx_vc7_wxtiff.vcproj @@ -27,7 +27,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff" - PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS" + PreprocessorDefinitions="WIN32;_LIB;_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="TRUE" ExceptionHandling="TRUE" BasicRuntimeChecks="3" @@ -48,7 +48,7 @@ SuppressStartupBanner="TRUE"/> @@ -58,7 +58,7 @@ Name="VCPreLinkEventTool"/> @@ -111,7 +111,7 @@ Name="VCPreLinkEventTool"/> @@ -167,7 +167,7 @@ Name="VCPreLinkEventTool"/> @@ -220,7 +220,7 @@ Name="VCPreLinkEventTool"/> @@ -276,7 +276,7 @@ Name="VCPreLinkEventTool"/> @@ -329,7 +329,7 @@ Name="VCPreLinkEventTool"/> @@ -385,7 +385,7 @@ Name="VCPreLinkEventTool"/> @@ -438,7 +438,7 @@ Name="VCPreLinkEventTool"/> + + diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj index 817e71e2ac..64fc2acd36 100644 --- a/build/msw/wx_vc8_core.vcproj +++ b/build/msw/wx_vc8_core.vcproj @@ -1119,10 +1119,10 @@ > - - + + @@ -5912,10 +5912,10 @@ > - - + + @@ -6807,10 +6807,6 @@ RelativePath="..\..\include\wx\encinfo.h" > - - diff --git a/build/msw/wx_vc8_wxtiff.vcproj b/build/msw/wx_vc8_wxtiff.vcproj index 66bf0dabfe..7b20fc8bc8 100644 --- a/build/msw/wx_vc8_wxtiff.vcproj +++ b/build/msw/wx_vc8_wxtiff.vcproj @@ -43,14 +43,14 @@ /> @@ -124,14 +124,14 @@ /> @@ -202,14 +202,14 @@ /> @@ -283,14 +283,14 @@ /> @@ -361,14 +361,14 @@ /> @@ -442,14 +442,14 @@ /> @@ -520,14 +520,14 @@ /> @@ -601,14 +601,14 @@ /> diff --git a/build/msw/wx_vc9_base.vcproj b/build/msw/wx_vc9_base.vcproj index c8b41a45f9..7c36be035e 100644 --- a/build/msw/wx_vc9_base.vcproj +++ b/build/msw/wx_vc9_base.vcproj @@ -1809,6 +1809,10 @@ RelativePath="..\..\include\wx\event.h" > + + diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj index 9492ec5dad..970d2c4bb0 100644 --- a/build/msw/wx_vc9_core.vcproj +++ b/build/msw/wx_vc9_core.vcproj @@ -1115,10 +1115,10 @@ > - - + + @@ -5908,10 +5908,10 @@ > - - + + @@ -6803,10 +6803,6 @@ RelativePath="..\..\include\wx\encinfo.h" > - - diff --git a/build/msw/wx_vc9_wxtiff.vcproj b/build/msw/wx_vc9_wxtiff.vcproj index 723a133164..84ad25d5c9 100644 --- a/build/msw/wx_vc9_wxtiff.vcproj +++ b/build/msw/wx_vc9_wxtiff.vcproj @@ -43,7 +43,7 @@ /> @@ -123,7 +123,7 @@ /> @@ -201,7 +201,7 @@ /> @@ -281,7 +281,7 @@ /> @@ -359,7 +359,7 @@ /> @@ -439,7 +439,7 @@ /> @@ -517,7 +517,7 @@ /> @@ -597,7 +597,7 @@ /> diff --git a/build/msw/wx_wxtiff.dsp b/build/msw/wx_wxtiff.dsp index a5c250b4d7..3273be1a4d 100644 --- a/build/msw/wx_wxtiff.dsp +++ b/build/msw/wx_wxtiff.dsp @@ -46,8 +46,8 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c -# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -69,8 +69,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -92,8 +92,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c -# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -115,8 +115,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -138,8 +138,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivu\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c -# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -161,8 +161,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivud\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -184,8 +184,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswu\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c -# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiff.pdb /opt:ref /opt:icf /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -207,8 +207,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswud\wxtiff" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxtiffd.pdb /I "..\..\src\zlib" /I "..\..\src\jpeg" /I "..\..\src\tiff\libtiff" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /D "_CRT_NONSTDC_NO_WARNINGS" /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe diff --git a/wxGTK.spec b/wxGTK.spec index e180bce148..6e906aa01d 100644 --- a/wxGTK.spec +++ b/wxGTK.spec @@ -243,6 +243,7 @@ wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h +wx/evtloop.h wx/except.h wx/features.h wx/flags.h diff --git a/wxMotif.spec b/wxMotif.spec index 32ecaadceb..e5708a4c2e 100644 --- a/wxMotif.spec +++ b/wxMotif.spec @@ -148,6 +148,7 @@ wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h +wx/evtloop.h wx/except.h wx/features.h wx/flags.h diff --git a/wxX11.spec b/wxX11.spec index bf79d96c4f..4af78798b0 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -172,6 +172,7 @@ wx/dynlib.h wx/dynload.h wx/encconv.h wx/event.h +wx/evtloop.h wx/except.h wx/features.h wx/flags.h -- 2.45.2