]> git.saurik.com Git - wxWidgets.git/commitdiff
Move wx/evtloop.h from GUI_CMN_HDR to BASE_CMN_HDR in files.bkl.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 24 Jan 2010 01:00:20 +0000 (01:00 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 24 Jan 2010 01:00:20 +0000 (01:00 +0000)
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

25 files changed:
Makefile.in
build/bakefiles/files.bkl
build/msw/config.bcc
build/msw/config.gcc
build/msw/config.vc
build/msw/config.wat
build/msw/makefile.bcc
build/msw/makefile.gcc
build/msw/makefile.vc
build/msw/makefile.wat
build/msw/wx_base.dsp
build/msw/wx_core.dsp
build/msw/wx_vc7_base.vcproj
build/msw/wx_vc7_core.vcproj
build/msw/wx_vc7_wxtiff.vcproj
build/msw/wx_vc8_base.vcproj
build/msw/wx_vc8_core.vcproj
build/msw/wx_vc8_wxtiff.vcproj
build/msw/wx_vc9_base.vcproj
build/msw/wx_vc9_core.vcproj
build/msw/wx_vc9_wxtiff.vcproj
build/msw/wx_wxtiff.dsp
wxGTK.spec
wxMotif.spec
wxX11.spec

index fdf92bd45cba4777389a40c02c291a2e83966f13..df181dd3340c60d504a8b37efdfb9ec715a9fb84 100644 (file)
@@ -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 \
index 5facb9bf9ebe74904962ed36eb3751c0b18b587c..5b0caa525c3629a4dedf8b42f21d4118343b1978 100644 (file)
@@ -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
index b5698678a8a37d7f1893b7da020d194927a28fe9..c0e43a75ce09073ea21ef7bbb809c9a51a118930 100644 (file)
-# =========================================================================
-#     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
-
+# =========================================================================\r
+#     This configuration file was generated by\r
+#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Beware that all changes made to this file will be overwritten next\r
+#     time you run Bakefile!\r
+# =========================================================================\r
+\r
+\r
+# -------------------------------------------------------------------------\r
+# These are configurable options:\r
+# -------------------------------------------------------------------------\r
+\r
+# C compiler \r
+!ifndef CC\r
+CC = bcc32\r
+!endif\r
+\r
+# C++ compiler \r
+!ifndef CXX\r
+CXX = bcc32\r
+!endif\r
+\r
+# Standard flags for CC \r
+!ifndef CFLAGS\r
+CFLAGS = \r
+!endif\r
+\r
+# Standard flags for C++ \r
+!ifndef CXXFLAGS\r
+CXXFLAGS = \r
+!endif\r
+\r
+# Standard preprocessor flags (common for CC and CXX) \r
+!ifndef CPPFLAGS\r
+CPPFLAGS = -a8 -g0\r
+!endif\r
+\r
+# Standard linker flags \r
+!ifndef LDFLAGS\r
+LDFLAGS = \r
+!endif\r
+\r
+# The C preprocessor \r
+!ifndef CPP\r
+CPP = cpp32 -Sr -oCON\r
+!endif\r
+\r
+# What type of library to build? [0,1]\r
+!ifndef SHARED\r
+SHARED = 0\r
+!endif\r
+\r
+# Build wxUniversal instead of native port? [0,1]\r
+!ifndef WXUNIV\r
+WXUNIV = 0\r
+!endif\r
+\r
+# Compile Unicode build of wxWidgets? [0,1]\r
+!ifndef UNICODE\r
+UNICODE = 1\r
+!endif\r
+\r
+# Use MSLU library when building Unicode version. [0,1]\r
+!ifndef MSLU\r
+MSLU = 0\r
+!endif\r
+\r
+# Type of compiled binaries [debug,release]\r
+!ifndef BUILD\r
+BUILD = debug\r
+!endif\r
+\r
+# Should debugging info be included in the executables? The default value\r
+# "default" means that debug info will be included if BUILD=debug\r
+# and not included if BUILD=release. [0,1,default]\r
+!ifndef DEBUG_INFO\r
+DEBUG_INFO = default\r
+!endif\r
+\r
+# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all\r
+# but expensive assert checks are enabled, use 0 to completely remove debugging\r
+# code. [0,1,default]\r
+!ifndef DEBUG_FLAG\r
+DEBUG_FLAG = 1\r
+!endif\r
+\r
+# Multiple libraries or single huge monolithic one? [0,1]\r
+!ifndef MONOLITHIC\r
+MONOLITHIC = 0\r
+!endif\r
+\r
+# Build GUI libraries? [0,1]\r
+!ifndef USE_GUI\r
+USE_GUI = 1\r
+!endif\r
+\r
+# Build wxHTML library (USE_GUI must be 1)? [0,1]\r
+!ifndef USE_HTML\r
+USE_HTML = 1\r
+!endif\r
+\r
+# Build multimedia library (USE_GUI must be 1)? [0,1]\r
+!ifndef USE_MEDIA\r
+USE_MEDIA = 1\r
+!endif\r
+\r
+# Build wxXRC library (USE_GUI must be 1)? [0,1]\r
+!ifndef USE_XRC\r
+USE_XRC = 1\r
+!endif\r
+\r
+# Build wxAUI library (USE_GUI must be 1)? [0,1]\r
+!ifndef USE_AUI\r
+USE_AUI = 1\r
+!endif\r
+\r
+# Build wxRibbon library (USE_GUI must be 1)? [0,1]\r
+!ifndef USE_RIBBON\r
+USE_RIBBON = 1\r
+!endif\r
+\r
+# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]\r
+!ifndef USE_PROPGRID\r
+USE_PROPGRID = 1\r
+!endif\r
+\r
+# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]\r
+!ifndef USE_RICHTEXT\r
+USE_RICHTEXT = 1\r
+!endif\r
+\r
+# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]\r
+!ifndef USE_STC\r
+USE_STC = 1\r
+!endif\r
+\r
+# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]\r
+!ifndef USE_OPENGL\r
+USE_OPENGL = 1\r
+!endif\r
+\r
+# Build quality assurance classes library (USE_GUI must be 1)? [0,1]\r
+!ifndef USE_QA\r
+USE_QA = 0\r
+!endif\r
+\r
+# Enable exceptions in compiled code. [0,1]\r
+!ifndef USE_EXCEPTIONS\r
+USE_EXCEPTIONS = 1\r
+!endif\r
+\r
+# Enable run-time type information (RTTI) in compiled code. [0,1]\r
+!ifndef USE_RTTI\r
+USE_RTTI = 1\r
+!endif\r
+\r
+# Enable threading in compiled code. [0,1]\r
+!ifndef USE_THREADS\r
+USE_THREADS = 1\r
+!endif\r
+\r
+# Enable wxCairoContext for platforms other than Linux/GTK. [0,1]\r
+!ifndef USE_CAIRO\r
+USE_CAIRO = 0\r
+!endif\r
+\r
+# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]\r
+!ifndef USE_GDIPLUS\r
+USE_GDIPLUS = 0\r
+!endif\r
+\r
+# Is this official build by wxWidgets developers? [0,1]\r
+!ifndef OFFICIAL_BUILD\r
+OFFICIAL_BUILD = 0\r
+!endif\r
+\r
+# Use this to name your customized DLLs differently \r
+!ifndef VENDOR\r
+VENDOR = custom\r
+!endif\r
+\r
+#  \r
+!ifndef WX_FLAVOUR\r
+WX_FLAVOUR = \r
+!endif\r
+\r
+#  \r
+!ifndef WX_LIB_FLAVOUR\r
+WX_LIB_FLAVOUR = \r
+!endif\r
+\r
+# Name of your custom configuration. This affects directory\r
+# where object files are stored as well as the location of\r
+# compiled .lib files and setup.h under the lib/ toplevel directory. \r
+!ifndef CFG\r
+CFG = \r
+!endif\r
+\r
+# Compiler flags needed to compile test suite in tests directory. If you want\r
+# to run the tests, set it so that the compiler can find CppUnit headers. \r
+!ifndef CPPUNIT_CFLAGS\r
+CPPUNIT_CFLAGS = \r
+!endif\r
+\r
+# Linker flags needed to link test suite in tests directory. If you want\r
+# to run the tests, include CppUnit library here. \r
+!ifndef CPPUNIT_LIBS\r
+CPPUNIT_LIBS = \r
+!endif\r
+\r
+# Version of C runtime library to use. You can change this to\r
+# static if SHARED=0, but it is highly recommended to not do\r
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]\r
+!ifndef RUNTIME_LIBS\r
+RUNTIME_LIBS = dynamic\r
+!endif\r
+\r
index feee56989b47b6bc39edab8dfed8c172aa241390..e35b9620a2c4dc53f00abefaaec5a60a1ab96f74 100644 (file)
-# =========================================================================
-#     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
-
+# =========================================================================\r
+#     This configuration file was generated by\r
+#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Beware that all changes made to this file will be overwritten next\r
+#     time you run Bakefile!\r
+# =========================================================================\r
+\r
+\r
+# -------------------------------------------------------------------------\r
+# These are configurable options:\r
+# -------------------------------------------------------------------------\r
+\r
+# Compiler flags to link shared library \r
+LINK_DLL_FLAGS ?= -shared\r
+\r
+# Compiler flags to link loadable module \r
+LINK_MODULE_FLAGS ?= -shared\r
+\r
+# C compiler \r
+CC = gcc\r
+\r
+# C++ compiler \r
+CXX = g++\r
+\r
+# Standard flags for CC \r
+CFLAGS ?= \r
+\r
+# Standard flags for C++ \r
+CXXFLAGS ?= \r
+\r
+# Standard preprocessor flags (common for CC and CXX) \r
+CPPFLAGS ?= \r
+\r
+# Standard linker flags \r
+LDFLAGS ?= \r
+\r
+# The C preprocessor \r
+CPP ?= $(CC) -E\r
+\r
+# What type of library to build? [0,1]\r
+SHARED ?= 0\r
+\r
+# Build wxUniversal instead of native port? [0,1]\r
+WXUNIV ?= 0\r
+\r
+# Compile Unicode build of wxWidgets? [0,1]\r
+UNICODE ?= 1\r
+\r
+# Use MSLU library when building Unicode version. [0,1]\r
+MSLU ?= 0\r
+\r
+# Type of compiled binaries [debug,release]\r
+BUILD ?= debug\r
+\r
+# Should debugging info be included in the executables? The default value\r
+# "default" means that debug info will be included if BUILD=debug\r
+# and not included if BUILD=release. [0,1,default]\r
+DEBUG_INFO ?= default\r
+\r
+# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all\r
+# but expensive assert checks are enabled, use 0 to completely remove debugging\r
+# code. [0,1,default]\r
+DEBUG_FLAG ?= 1\r
+\r
+# Multiple libraries or single huge monolithic one? [0,1]\r
+MONOLITHIC ?= 0\r
+\r
+# Build GUI libraries? [0,1]\r
+USE_GUI ?= 1\r
+\r
+# Build wxHTML library (USE_GUI must be 1)? [0,1]\r
+USE_HTML ?= 1\r
+\r
+# Build multimedia library (USE_GUI must be 1)? [0,1]\r
+USE_MEDIA ?= 1\r
+\r
+# Build wxXRC library (USE_GUI must be 1)? [0,1]\r
+USE_XRC ?= 1\r
+\r
+# Build wxAUI library (USE_GUI must be 1)? [0,1]\r
+USE_AUI ?= 1\r
+\r
+# Build wxRibbon library (USE_GUI must be 1)? [0,1]\r
+USE_RIBBON ?= 1\r
+\r
+# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]\r
+USE_PROPGRID ?= 1\r
+\r
+# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]\r
+USE_RICHTEXT ?= 1\r
+\r
+# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]\r
+USE_STC ?= 1\r
+\r
+# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]\r
+USE_OPENGL ?= 1\r
+\r
+# Build quality assurance classes library (USE_GUI must be 1)? [0,1]\r
+USE_QA ?= 0\r
+\r
+# Enable exceptions in compiled code. [0,1]\r
+USE_EXCEPTIONS ?= 1\r
+\r
+# Enable run-time type information (RTTI) in compiled code. [0,1]\r
+USE_RTTI ?= 1\r
+\r
+# Enable threading in compiled code. [0,1]\r
+USE_THREADS ?= 1\r
+\r
+# Enable wxCairoContext for platforms other than Linux/GTK. [0,1]\r
+USE_CAIRO ?= 0\r
+\r
+# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]\r
+USE_GDIPLUS ?= 0\r
+\r
+# Is this official build by wxWidgets developers? [0,1]\r
+OFFICIAL_BUILD ?= 0\r
+\r
+# Use this to name your customized DLLs differently \r
+VENDOR ?= custom\r
+\r
+#  \r
+WX_FLAVOUR ?= \r
+\r
+#  \r
+WX_LIB_FLAVOUR ?= \r
+\r
+# Name of your custom configuration. This affects directory\r
+# where object files are stored as well as the location of\r
+# compiled .lib files and setup.h under the lib/ toplevel directory. \r
+CFG ?= \r
+\r
+# Compiler flags needed to compile test suite in tests directory. If you want\r
+# to run the tests, set it so that the compiler can find CppUnit headers. \r
+CPPUNIT_CFLAGS ?= \r
+\r
+# Linker flags needed to link test suite in tests directory. If you want\r
+# to run the tests, include CppUnit library here. \r
+CPPUNIT_LIBS ?= \r
+\r
+# Version of C runtime library to use. You can change this to\r
+# static if SHARED=0, but it is highly recommended to not do\r
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]\r
+RUNTIME_LIBS ?= dynamic\r
+\r
+# Set the version of your Mingw installation here.\r
+#     "3" ...... this is for Mingw 2.0 or newer (comes with gcc3)\r
+#     "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95]\r
+GCC_VERSION ?= 3\r
+\r
index 149f46fc64d5685224d28ada0d3a3fbe2acd9f34..64c21a8fb6599602b838fca090e1ff9ab1878525 100644 (file)
-# =========================================================================
-#     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
-
+# =========================================================================\r
+#     This configuration file was generated by\r
+#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Beware that all changes made to this file will be overwritten next\r
+#     time you run Bakefile!\r
+# =========================================================================\r
+\r
+\r
+# -------------------------------------------------------------------------\r
+# These are configurable options:\r
+# -------------------------------------------------------------------------\r
+\r
+# C compiler \r
+CC = cl\r
+\r
+# C++ compiler \r
+CXX = cl\r
+\r
+# Standard flags for CC \r
+CFLAGS = \r
+\r
+# Standard flags for C++ \r
+CXXFLAGS = \r
+\r
+# Standard preprocessor flags (common for CC and CXX) \r
+CPPFLAGS = \r
+\r
+# Standard linker flags \r
+LDFLAGS = \r
+\r
+# The C preprocessor \r
+CPP = $(CC) /EP /nologo\r
+\r
+# What type of library to build? [0,1]\r
+SHARED = 0\r
+\r
+# Build wxUniversal instead of native port? [0,1]\r
+WXUNIV = 0\r
+\r
+# Compile Unicode build of wxWidgets? [0,1]\r
+UNICODE = 1\r
+\r
+# Use MSLU library when building Unicode version. [0,1]\r
+MSLU = 0\r
+\r
+# Type of compiled binaries [debug,release]\r
+BUILD = debug\r
+\r
+# The target processor architecture must be specified when it is not X86.\r
+# This does not affect the compiler output, so you still need to make sure\r
+# your environment is set up appropriately with the correct compiler in the\r
+# PATH. Rather it affects some options passed to some of the common build\r
+# utilities such as the resource compiler and the linker.\r
+# \r
+# Accepted values: AMD64, IA64. \r
+TARGET_CPU = $(CPU)\r
+\r
+# Should debugging info be included in the executables? The default value\r
+# "default" means that debug info will be included if BUILD=debug\r
+# and not included if BUILD=release. [0,1,default]\r
+DEBUG_INFO = 1\r
+\r
+# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all\r
+# but expensive assert checks are enabled, use 0 to completely remove debugging\r
+# code. [0,1,default]\r
+DEBUG_FLAG = 1\r
+\r
+# Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL?\r
+# Default is to use debug CRT if and only if BUILD==debug. [0,1,default]\r
+DEBUG_RUNTIME_LIBS = default\r
+\r
+# Multiple libraries or single huge monolithic one? [0,1]\r
+MONOLITHIC = 0\r
+\r
+# Build GUI libraries? [0,1]\r
+USE_GUI = 1\r
+\r
+# Build wxHTML library (USE_GUI must be 1)? [0,1]\r
+USE_HTML = 1\r
+\r
+# Build multimedia library (USE_GUI must be 1)? [0,1]\r
+USE_MEDIA = 1\r
+\r
+# Build wxXRC library (USE_GUI must be 1)? [0,1]\r
+USE_XRC = 1\r
+\r
+# Build wxAUI library (USE_GUI must be 1)? [0,1]\r
+USE_AUI = 1\r
+\r
+# Build wxRibbon library (USE_GUI must be 1)? [0,1]\r
+USE_RIBBON = 1\r
+\r
+# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]\r
+USE_PROPGRID = 1\r
+\r
+# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]\r
+USE_RICHTEXT = 1\r
+\r
+# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]\r
+USE_STC = 1\r
+\r
+# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]\r
+USE_OPENGL = 1\r
+\r
+# Build quality assurance classes library (USE_GUI must be 1)? [0,1]\r
+USE_QA = 1\r
+\r
+# Enable exceptions in compiled code. [0,1]\r
+USE_EXCEPTIONS = 1\r
+\r
+# Enable run-time type information (RTTI) in compiled code. [0,1]\r
+USE_RTTI = 1\r
+\r
+# Enable threading in compiled code. [0,1]\r
+USE_THREADS = 1\r
+\r
+# Enable wxCairoContext for platforms other than Linux/GTK. [0,1]\r
+USE_CAIRO = 0\r
+\r
+# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]\r
+USE_GDIPLUS = 0\r
+\r
+# Is this official build by wxWidgets developers? [0,1]\r
+OFFICIAL_BUILD = 0\r
+\r
+# Use this to name your customized DLLs differently \r
+VENDOR = custom\r
+\r
+#  \r
+WX_FLAVOUR = \r
+\r
+#  \r
+WX_LIB_FLAVOUR = \r
+\r
+# Name of your custom configuration. This affects directory\r
+# where object files are stored as well as the location of\r
+# compiled .lib files and setup.h under the lib/ toplevel directory. \r
+CFG = \r
+\r
+# Compiler flags needed to compile test suite in tests directory. If you want\r
+# to run the tests, set it so that the compiler can find CppUnit headers. \r
+CPPUNIT_CFLAGS = \r
+\r
+# Linker flags needed to link test suite in tests directory. If you want\r
+# to run the tests, include CppUnit library here. \r
+CPPUNIT_LIBS = \r
+\r
+# Version of C runtime library to use. You can change this to\r
+# static if SHARED=0, but it is highly recommended to not do\r
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]\r
+RUNTIME_LIBS = dynamic\r
+\r
index 5e07695e9f9798342d689d32ed76b6a7bc10a9f5..f5d58b6770ee6aa2c00af40557baa83a1ea86e80 100644 (file)
-# =========================================================================
-#     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
-
+# =========================================================================\r
+#     This configuration file was generated by\r
+#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Beware that all changes made to this file will be overwritten next\r
+#     time you run Bakefile!\r
+# =========================================================================\r
+\r
+\r
+# -------------------------------------------------------------------------\r
+# These are configurable options:\r
+# -------------------------------------------------------------------------\r
+\r
+# C compiler \r
+CC = wcc386\r
+\r
+# C++ compiler \r
+CXX = wpp386\r
+\r
+# Standard flags for CC \r
+CFLAGS = \r
+\r
+# Standard flags for C++ \r
+CXXFLAGS = \r
+\r
+# Standard preprocessor flags (common for CC and CXX) \r
+CPPFLAGS = \r
+\r
+# Standard linker flags \r
+LDFLAGS = \r
+\r
+# The C preprocessor \r
+CPP = $(CC) -p\r
+\r
+# What type of library to build? [0,1]\r
+#   1 - DLL\r
+SHARED = 0\r
+\r
+# Build wxUniversal instead of native port? [0,1]\r
+#   1 - Universal\r
+WXUNIV = 0\r
+\r
+# Compile Unicode build of wxWidgets? [0,1]\r
+#   1 - Unicode\r
+UNICODE = 1\r
+\r
+# Type of compiled binaries [debug,release]\r
+BUILD = debug\r
+\r
+# Should debugging info be included in the executables? The default value\r
+# "default" means that debug info will be included if BUILD=debug\r
+# and not included if BUILD=release. [0,1,default]\r
+DEBUG_INFO = default\r
+\r
+# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all\r
+# but expensive assert checks are enabled, use 0 to completely remove debugging\r
+# code. [0,1,default]\r
+DEBUG_FLAG = 1\r
+\r
+# Multiple libraries or single huge monolithic one? [0,1]\r
+#   0 - Multilib\r
+#   1 - Monolithic\r
+MONOLITHIC = 1\r
+\r
+# Build GUI libraries? [0,1]\r
+#   0 - Base\r
+#   1 - GUI\r
+USE_GUI = 1\r
+\r
+# Build wxHTML library (USE_GUI must be 1)? [0,1]\r
+USE_HTML = 1\r
+\r
+# Build multimedia library (USE_GUI must be 1)? [0,1]\r
+USE_MEDIA = 1\r
+\r
+# Build wxXRC library (USE_GUI must be 1)? [0,1]\r
+USE_XRC = 1\r
+\r
+# Build wxAUI library (USE_GUI must be 1)? [0,1]\r
+USE_AUI = 1\r
+\r
+# Build wxRibbon library (USE_GUI must be 1)? [0,1]\r
+USE_RIBBON = 1\r
+\r
+# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1]\r
+USE_PROPGRID = 1\r
+\r
+# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1]\r
+USE_RICHTEXT = 1\r
+\r
+# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1]\r
+USE_STC = 1\r
+\r
+# Build OpenGL canvas library (USE_GUI must be 1)? [0,1]\r
+USE_OPENGL = 1\r
+\r
+# Build quality assurance classes library (USE_GUI must be 1)? [0,1]\r
+USE_QA = 0\r
+\r
+# Enable exceptions in compiled code. [0,1]\r
+USE_EXCEPTIONS = 1\r
+\r
+# Enable run-time type information (RTTI) in compiled code. [0,1]\r
+USE_RTTI = 1\r
+\r
+# Enable threading in compiled code. [0,1]\r
+USE_THREADS = 1\r
+\r
+# Enable wxCairoContext for platforms other than Linux/GTK. [0,1]\r
+USE_CAIRO = 0\r
+\r
+# Link with gdiplus.lib? (Needed for wxGraphicsContext, will also set wxUSE_GRAPHICS_CONTEXT) [0,1]\r
+USE_GDIPLUS = 0\r
+\r
+# Is this official build by wxWidgets developers? [0,1]\r
+OFFICIAL_BUILD = 0\r
+\r
+# Use this to name your customized DLLs differently \r
+VENDOR = custom\r
+\r
+#  \r
+WX_FLAVOUR = \r
+\r
+#  \r
+WX_LIB_FLAVOUR = \r
+\r
+# Name of your custom configuration. This affects directory\r
+# where object files are stored as well as the location of\r
+# compiled .lib files and setup.h under the lib/ toplevel directory. \r
+CFG = \r
+\r
+# Compiler flags needed to compile test suite in tests directory. If you want\r
+# to run the tests, set it so that the compiler can find CppUnit headers. \r
+CPPUNIT_CFLAGS = \r
+\r
+# Linker flags needed to link test suite in tests directory. If you want\r
+# to run the tests, include CppUnit library here. \r
+CPPUNIT_LIBS = \r
+\r
+# Version of C runtime library to use. You can change this to\r
+# static if SHARED=0, but it is highly recommended to not do\r
+# it if SHARED=1 unless you know what you are doing. [dynamic,static]\r
+RUNTIME_LIBS = dynamic\r
+\r
index 09309b7893f901bf4d5e8d72a48a830c1edede2d..646e976648e9856f44111a578cef00abbf7e43bb 100644 (file)
@@ -1815,13 +1815,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_listctrlcmn.obj \\r
        $(OBJS)\monodll_matrix.obj \\r
        $(OBJS)\monodll_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_nbkbase.obj \\r
+       $(OBJS)\monodll_overlaycmn.obj \\r
+       $(OBJS)\monodll_ownerdrwcmn.obj \\r
+       $(OBJS)\monodll_paper.obj \\r
+       $(OBJS)\monodll_persist.obj \\r
+       $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
@@ -2058,13 +2058,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_listctrlcmn.obj \\r
        $(OBJS)\monodll_matrix.obj \\r
        $(OBJS)\monodll_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_nbkbase.obj \\r
+       $(OBJS)\monodll_overlaycmn.obj \\r
+       $(OBJS)\monodll_ownerdrwcmn.obj \\r
+       $(OBJS)\monodll_paper.obj \\r
+       $(OBJS)\monodll_persist.obj \\r
+       $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
@@ -2517,13 +2517,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_listctrlcmn.obj \\r
        $(OBJS)\monolib_matrix.obj \\r
        $(OBJS)\monolib_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_nbkbase.obj \\r
+       $(OBJS)\monolib_overlaycmn.obj \\r
+       $(OBJS)\monolib_ownerdrwcmn.obj \\r
+       $(OBJS)\monolib_paper.obj \\r
+       $(OBJS)\monolib_persist.obj \\r
+       $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
@@ -2760,13 +2760,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_listctrlcmn.obj \\r
        $(OBJS)\monolib_matrix.obj \\r
        $(OBJS)\monolib_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_nbkbase.obj \\r
+       $(OBJS)\monolib_overlaycmn.obj \\r
+       $(OBJS)\monolib_ownerdrwcmn.obj \\r
+       $(OBJS)\monolib_paper.obj \\r
+       $(OBJS)\monolib_persist.obj \\r
+       $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
@@ -3112,13 +3112,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_listctrlcmn.obj \\r
        $(OBJS)\coredll_matrix.obj \\r
        $(OBJS)\coredll_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\coredll_nbkbase.obj \\r
+       $(OBJS)\coredll_overlaycmn.obj \\r
+       $(OBJS)\coredll_ownerdrwcmn.obj \\r
+       $(OBJS)\coredll_paper.obj \\r
+       $(OBJS)\coredll_persist.obj \\r
+       $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
@@ -3355,13 +3355,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_listctrlcmn.obj \\r
        $(OBJS)\coredll_matrix.obj \\r
        $(OBJS)\coredll_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\coredll_nbkbase.obj \\r
+       $(OBJS)\coredll_overlaycmn.obj \\r
+       $(OBJS)\coredll_ownerdrwcmn.obj \\r
+       $(OBJS)\coredll_paper.obj \\r
+       $(OBJS)\coredll_persist.obj \\r
+       $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
@@ -3603,13 +3603,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_listctrlcmn.obj \\r
        $(OBJS)\corelib_matrix.obj \\r
        $(OBJS)\corelib_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\corelib_nbkbase.obj \\r
+       $(OBJS)\corelib_overlaycmn.obj \\r
+       $(OBJS)\corelib_ownerdrwcmn.obj \\r
+       $(OBJS)\corelib_paper.obj \\r
+       $(OBJS)\corelib_persist.obj \\r
+       $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
@@ -3846,13 +3846,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_listctrlcmn.obj \\r
        $(OBJS)\corelib_matrix.obj \\r
        $(OBJS)\corelib_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\corelib_nbkbase.obj \\r
+       $(OBJS)\corelib_overlaycmn.obj \\r
+       $(OBJS)\corelib_ownerdrwcmn.obj \\r
+       $(OBJS)\corelib_paper.obj \\r
+       $(OBJS)\corelib_persist.obj \\r
+       $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
@@ -7312,17 +7312,17 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
-!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\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
+!endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp\r
@@ -9494,17 +9494,17 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
-!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\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp\r
+       $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
+!endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp\r
@@ -11679,17 +11679,17 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
-!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\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp\r
+       $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
+!endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp\r
@@ -12958,17 +12958,17 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
-!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\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp\r
+       $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
+!endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp\r
index 0a669584c0d432764ce4e2a8b32f79a8157c2c46..74d355a568c171d3bff52a5b6fbf7bbf05b0ff82 100644 (file)
@@ -1842,13 +1842,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_listctrlcmn.o \\r
        $(OBJS)\monodll_matrix.o \\r
        $(OBJS)\monodll_menucmn.o \\r
-       $(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 \\r
+       $(OBJS)\monodll_nbkbase.o \\r
+       $(OBJS)\monodll_overlaycmn.o \\r
+       $(OBJS)\monodll_ownerdrwcmn.o \\r
+       $(OBJS)\monodll_paper.o \\r
+       $(OBJS)\monodll_persist.o \\r
+       $(OBJS)\monodll_pickerbase.o \\r
        $(OBJS)\monodll_popupcmn.o \\r
        $(OBJS)\monodll_prntbase.o \\r
        $(OBJS)\monodll_quantize.o \\r
@@ -2087,13 +2087,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_listctrlcmn.o \\r
        $(OBJS)\monodll_matrix.o \\r
        $(OBJS)\monodll_menucmn.o \\r
-       $(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 \\r
+       $(OBJS)\monodll_nbkbase.o \\r
+       $(OBJS)\monodll_overlaycmn.o \\r
+       $(OBJS)\monodll_ownerdrwcmn.o \\r
+       $(OBJS)\monodll_paper.o \\r
+       $(OBJS)\monodll_persist.o \\r
+       $(OBJS)\monodll_pickerbase.o \\r
        $(OBJS)\monodll_popupcmn.o \\r
        $(OBJS)\monodll_prntbase.o \\r
        $(OBJS)\monodll_quantize.o \\r
@@ -2550,13 +2550,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_listctrlcmn.o \\r
        $(OBJS)\monolib_matrix.o \\r
        $(OBJS)\monolib_menucmn.o \\r
-       $(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 \\r
+       $(OBJS)\monolib_nbkbase.o \\r
+       $(OBJS)\monolib_overlaycmn.o \\r
+       $(OBJS)\monolib_ownerdrwcmn.o \\r
+       $(OBJS)\monolib_paper.o \\r
+       $(OBJS)\monolib_persist.o \\r
+       $(OBJS)\monolib_pickerbase.o \\r
        $(OBJS)\monolib_popupcmn.o \\r
        $(OBJS)\monolib_prntbase.o \\r
        $(OBJS)\monolib_quantize.o \\r
@@ -2795,13 +2795,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_listctrlcmn.o \\r
        $(OBJS)\monolib_matrix.o \\r
        $(OBJS)\monolib_menucmn.o \\r
-       $(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 \\r
+       $(OBJS)\monolib_nbkbase.o \\r
+       $(OBJS)\monolib_overlaycmn.o \\r
+       $(OBJS)\monolib_ownerdrwcmn.o \\r
+       $(OBJS)\monolib_paper.o \\r
+       $(OBJS)\monolib_persist.o \\r
+       $(OBJS)\monolib_pickerbase.o \\r
        $(OBJS)\monolib_popupcmn.o \\r
        $(OBJS)\monolib_prntbase.o \\r
        $(OBJS)\monolib_quantize.o \\r
@@ -3161,13 +3161,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_listctrlcmn.o \\r
        $(OBJS)\coredll_matrix.o \\r
        $(OBJS)\coredll_menucmn.o \\r
-       $(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 \\r
+       $(OBJS)\coredll_nbkbase.o \\r
+       $(OBJS)\coredll_overlaycmn.o \\r
+       $(OBJS)\coredll_ownerdrwcmn.o \\r
+       $(OBJS)\coredll_paper.o \\r
+       $(OBJS)\coredll_persist.o \\r
+       $(OBJS)\coredll_pickerbase.o \\r
        $(OBJS)\coredll_popupcmn.o \\r
        $(OBJS)\coredll_prntbase.o \\r
        $(OBJS)\coredll_quantize.o \\r
@@ -3406,13 +3406,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_listctrlcmn.o \\r
        $(OBJS)\coredll_matrix.o \\r
        $(OBJS)\coredll_menucmn.o \\r
-       $(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 \\r
+       $(OBJS)\coredll_nbkbase.o \\r
+       $(OBJS)\coredll_overlaycmn.o \\r
+       $(OBJS)\coredll_ownerdrwcmn.o \\r
+       $(OBJS)\coredll_paper.o \\r
+       $(OBJS)\coredll_persist.o \\r
+       $(OBJS)\coredll_pickerbase.o \\r
        $(OBJS)\coredll_popupcmn.o \\r
        $(OBJS)\coredll_prntbase.o \\r
        $(OBJS)\coredll_quantize.o \\r
@@ -3660,13 +3660,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_listctrlcmn.o \\r
        $(OBJS)\corelib_matrix.o \\r
        $(OBJS)\corelib_menucmn.o \\r
-       $(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 \\r
+       $(OBJS)\corelib_nbkbase.o \\r
+       $(OBJS)\corelib_overlaycmn.o \\r
+       $(OBJS)\corelib_ownerdrwcmn.o \\r
+       $(OBJS)\corelib_paper.o \\r
+       $(OBJS)\corelib_persist.o \\r
+       $(OBJS)\corelib_pickerbase.o \\r
        $(OBJS)\corelib_popupcmn.o \\r
        $(OBJS)\corelib_prntbase.o \\r
        $(OBJS)\corelib_quantize.o \\r
@@ -3905,13 +3905,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_listctrlcmn.o \\r
        $(OBJS)\corelib_matrix.o \\r
        $(OBJS)\corelib_menucmn.o \\r
-       $(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 \\r
+       $(OBJS)\corelib_nbkbase.o \\r
+       $(OBJS)\corelib_overlaycmn.o \\r
+       $(OBJS)\corelib_ownerdrwcmn.o \\r
+       $(OBJS)\corelib_paper.o \\r
+       $(OBJS)\corelib_persist.o \\r
+       $(OBJS)\corelib_pickerbase.o \\r
        $(OBJS)\corelib_popupcmn.o \\r
        $(OBJS)\corelib_prntbase.o \\r
        $(OBJS)\corelib_quantize.o \\r
@@ -7478,17 +7478,17 @@ endif
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_overlaycmn.o: ../../src/common/overlaycmn.cpp\r
        $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
-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\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monodll_paper.o: ../../src/common/paper.cpp\r
+       $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
 \r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monodll_persist.o: ../../src/common/persist.cpp\r
@@ -9660,17 +9660,17 @@ endif
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_overlaycmn.o: ../../src/common/overlaycmn.cpp\r
        $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
-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\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\monolib_paper.o: ../../src/common/paper.cpp\r
+       $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
 \r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\monolib_persist.o: ../../src/common/persist.cpp\r
@@ -11845,17 +11845,17 @@ endif
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_overlaycmn.o: ../../src/common/overlaycmn.cpp\r
        $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
-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\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\coredll_paper.o: ../../src/common/paper.cpp\r
+       $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
 \r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\coredll_persist.o: ../../src/common/persist.cpp\r
@@ -13124,17 +13124,17 @@ endif
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_overlaycmn.o: ../../src/common/overlaycmn.cpp\r
        $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
-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\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
+\r
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\corelib_paper.o: ../../src/common/paper.cpp\r
+       $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<\r
+endif\r
 \r
 ifeq ($(USE_GUI),1)\r
 $(OBJS)\corelib_persist.o: ../../src/common/persist.cpp\r
index 9ec758c9b5383016524dff9ff12fe89ce9e1a971..1f22ad112ea6bf25979374688c6e5d4e781ad9c8 100644 (file)
@@ -2040,13 +2040,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_listctrlcmn.obj \\r
        $(OBJS)\monodll_matrix.obj \\r
        $(OBJS)\monodll_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_nbkbase.obj \\r
+       $(OBJS)\monodll_overlaycmn.obj \\r
+       $(OBJS)\monodll_ownerdrwcmn.obj \\r
+       $(OBJS)\monodll_paper.obj \\r
+       $(OBJS)\monodll_persist.obj \\r
+       $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
@@ -2283,13 +2283,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
        $(OBJS)\monodll_listctrlcmn.obj \\r
        $(OBJS)\monodll_matrix.obj \\r
        $(OBJS)\monodll_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monodll_nbkbase.obj \\r
+       $(OBJS)\monodll_overlaycmn.obj \\r
+       $(OBJS)\monodll_ownerdrwcmn.obj \\r
+       $(OBJS)\monodll_paper.obj \\r
+       $(OBJS)\monodll_persist.obj \\r
+       $(OBJS)\monodll_pickerbase.obj \\r
        $(OBJS)\monodll_popupcmn.obj \\r
        $(OBJS)\monodll_prntbase.obj \\r
        $(OBJS)\monodll_quantize.obj \\r
@@ -2748,13 +2748,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_listctrlcmn.obj \\r
        $(OBJS)\monolib_matrix.obj \\r
        $(OBJS)\monolib_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_nbkbase.obj \\r
+       $(OBJS)\monolib_overlaycmn.obj \\r
+       $(OBJS)\monolib_ownerdrwcmn.obj \\r
+       $(OBJS)\monolib_paper.obj \\r
+       $(OBJS)\monolib_persist.obj \\r
+       $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
@@ -2991,13 +2991,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
        $(OBJS)\monolib_listctrlcmn.obj \\r
        $(OBJS)\monolib_matrix.obj \\r
        $(OBJS)\monolib_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\monolib_nbkbase.obj \\r
+       $(OBJS)\monolib_overlaycmn.obj \\r
+       $(OBJS)\monolib_ownerdrwcmn.obj \\r
+       $(OBJS)\monolib_paper.obj \\r
+       $(OBJS)\monolib_persist.obj \\r
+       $(OBJS)\monolib_pickerbase.obj \\r
        $(OBJS)\monolib_popupcmn.obj \\r
        $(OBJS)\monolib_prntbase.obj \\r
        $(OBJS)\monolib_quantize.obj \\r
@@ -3409,13 +3409,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_listctrlcmn.obj \\r
        $(OBJS)\coredll_matrix.obj \\r
        $(OBJS)\coredll_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\coredll_nbkbase.obj \\r
+       $(OBJS)\coredll_overlaycmn.obj \\r
+       $(OBJS)\coredll_ownerdrwcmn.obj \\r
+       $(OBJS)\coredll_paper.obj \\r
+       $(OBJS)\coredll_persist.obj \\r
+       $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
@@ -3652,13 +3652,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
        $(OBJS)\coredll_listctrlcmn.obj \\r
        $(OBJS)\coredll_matrix.obj \\r
        $(OBJS)\coredll_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\coredll_nbkbase.obj \\r
+       $(OBJS)\coredll_overlaycmn.obj \\r
+       $(OBJS)\coredll_ownerdrwcmn.obj \\r
+       $(OBJS)\coredll_paper.obj \\r
+       $(OBJS)\coredll_persist.obj \\r
+       $(OBJS)\coredll_pickerbase.obj \\r
        $(OBJS)\coredll_popupcmn.obj \\r
        $(OBJS)\coredll_prntbase.obj \\r
        $(OBJS)\coredll_quantize.obj \\r
@@ -3906,13 +3906,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_listctrlcmn.obj \\r
        $(OBJS)\corelib_matrix.obj \\r
        $(OBJS)\corelib_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\corelib_nbkbase.obj \\r
+       $(OBJS)\corelib_overlaycmn.obj \\r
+       $(OBJS)\corelib_ownerdrwcmn.obj \\r
+       $(OBJS)\corelib_paper.obj \\r
+       $(OBJS)\corelib_persist.obj \\r
+       $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
@@ -4149,13 +4149,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
        $(OBJS)\corelib_listctrlcmn.obj \\r
        $(OBJS)\corelib_matrix.obj \\r
        $(OBJS)\corelib_menucmn.obj \\r
-       $(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 \\r
+       $(OBJS)\corelib_nbkbase.obj \\r
+       $(OBJS)\corelib_overlaycmn.obj \\r
+       $(OBJS)\corelib_ownerdrwcmn.obj \\r
+       $(OBJS)\corelib_paper.obj \\r
+       $(OBJS)\corelib_persist.obj \\r
+       $(OBJS)\corelib_pickerbase.obj \\r
        $(OBJS)\corelib_popupcmn.obj \\r
        $(OBJS)\corelib_prntbase.obj \\r
        $(OBJS)\corelib_quantize.obj \\r
@@ -7909,17 +7909,17 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
-!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\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
+!endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp\r
@@ -10091,17 +10091,17 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
-!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\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
+!endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp\r
@@ -12276,17 +12276,17 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
-!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\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp\r
+!endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp\r
@@ -13555,17 +13555,17 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp\r
-!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\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp\r
+!endif\r
+\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp\r
+!endif\r
 \r
 !if "$(USE_GUI)" == "1"\r
 $(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp\r
index fcf8be5add78749b9a1c086c7c7e0efaa686eddc..62089c5505d14bc85c8635640026a58d44a9056e 100644 (file)
@@ -408,13 +408,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_listctrlcmn.obj &\r
        $(OBJS)\monodll_matrix.obj &\r
        $(OBJS)\monodll_menucmn.obj &\r
-       $(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 &\r
+       $(OBJS)\monodll_nbkbase.obj &\r
+       $(OBJS)\monodll_overlaycmn.obj &\r
+       $(OBJS)\monodll_ownerdrwcmn.obj &\r
+       $(OBJS)\monodll_paper.obj &\r
+       $(OBJS)\monodll_persist.obj &\r
+       $(OBJS)\monodll_pickerbase.obj &\r
        $(OBJS)\monodll_popupcmn.obj &\r
        $(OBJS)\monodll_prntbase.obj &\r
        $(OBJS)\monodll_quantize.obj &\r
@@ -653,13 +653,13 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
        $(OBJS)\monodll_listctrlcmn.obj &\r
        $(OBJS)\monodll_matrix.obj &\r
        $(OBJS)\monodll_menucmn.obj &\r
-       $(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 &\r
+       $(OBJS)\monodll_nbkbase.obj &\r
+       $(OBJS)\monodll_overlaycmn.obj &\r
+       $(OBJS)\monodll_ownerdrwcmn.obj &\r
+       $(OBJS)\monodll_paper.obj &\r
+       $(OBJS)\monodll_persist.obj &\r
+       $(OBJS)\monodll_pickerbase.obj &\r
        $(OBJS)\monodll_popupcmn.obj &\r
        $(OBJS)\monodll_prntbase.obj &\r
        $(OBJS)\monodll_quantize.obj &\r
@@ -1121,13 +1121,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_listctrlcmn.obj &\r
        $(OBJS)\monolib_matrix.obj &\r
        $(OBJS)\monolib_menucmn.obj &\r
-       $(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 &\r
+       $(OBJS)\monolib_nbkbase.obj &\r
+       $(OBJS)\monolib_overlaycmn.obj &\r
+       $(OBJS)\monolib_ownerdrwcmn.obj &\r
+       $(OBJS)\monolib_paper.obj &\r
+       $(OBJS)\monolib_persist.obj &\r
+       $(OBJS)\monolib_pickerbase.obj &\r
        $(OBJS)\monolib_popupcmn.obj &\r
        $(OBJS)\monolib_prntbase.obj &\r
        $(OBJS)\monolib_quantize.obj &\r
@@ -1366,13 +1366,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
        $(OBJS)\monolib_listctrlcmn.obj &\r
        $(OBJS)\monolib_matrix.obj &\r
        $(OBJS)\monolib_menucmn.obj &\r
-       $(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 &\r
+       $(OBJS)\monolib_nbkbase.obj &\r
+       $(OBJS)\monolib_overlaycmn.obj &\r
+       $(OBJS)\monolib_ownerdrwcmn.obj &\r
+       $(OBJS)\monolib_paper.obj &\r
+       $(OBJS)\monolib_persist.obj &\r
+       $(OBJS)\monolib_pickerbase.obj &\r
        $(OBJS)\monolib_popupcmn.obj &\r
        $(OBJS)\monolib_prntbase.obj &\r
        $(OBJS)\monolib_quantize.obj &\r
@@ -1743,13 +1743,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_listctrlcmn.obj &\r
        $(OBJS)\coredll_matrix.obj &\r
        $(OBJS)\coredll_menucmn.obj &\r
-       $(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 &\r
+       $(OBJS)\coredll_nbkbase.obj &\r
+       $(OBJS)\coredll_overlaycmn.obj &\r
+       $(OBJS)\coredll_ownerdrwcmn.obj &\r
+       $(OBJS)\coredll_paper.obj &\r
+       $(OBJS)\coredll_persist.obj &\r
+       $(OBJS)\coredll_pickerbase.obj &\r
        $(OBJS)\coredll_popupcmn.obj &\r
        $(OBJS)\coredll_prntbase.obj &\r
        $(OBJS)\coredll_quantize.obj &\r
@@ -1988,13 +1988,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
        $(OBJS)\coredll_listctrlcmn.obj &\r
        $(OBJS)\coredll_matrix.obj &\r
        $(OBJS)\coredll_menucmn.obj &\r
-       $(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 &\r
+       $(OBJS)\coredll_nbkbase.obj &\r
+       $(OBJS)\coredll_overlaycmn.obj &\r
+       $(OBJS)\coredll_ownerdrwcmn.obj &\r
+       $(OBJS)\coredll_paper.obj &\r
+       $(OBJS)\coredll_persist.obj &\r
+       $(OBJS)\coredll_pickerbase.obj &\r
        $(OBJS)\coredll_popupcmn.obj &\r
        $(OBJS)\coredll_prntbase.obj &\r
        $(OBJS)\coredll_quantize.obj &\r
@@ -2244,13 +2244,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_listctrlcmn.obj &\r
        $(OBJS)\corelib_matrix.obj &\r
        $(OBJS)\corelib_menucmn.obj &\r
-       $(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 &\r
+       $(OBJS)\corelib_nbkbase.obj &\r
+       $(OBJS)\corelib_overlaycmn.obj &\r
+       $(OBJS)\corelib_ownerdrwcmn.obj &\r
+       $(OBJS)\corelib_paper.obj &\r
+       $(OBJS)\corelib_persist.obj &\r
+       $(OBJS)\corelib_pickerbase.obj &\r
        $(OBJS)\corelib_popupcmn.obj &\r
        $(OBJS)\corelib_prntbase.obj &\r
        $(OBJS)\corelib_quantize.obj &\r
@@ -2489,13 +2489,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
        $(OBJS)\corelib_listctrlcmn.obj &\r
        $(OBJS)\corelib_matrix.obj &\r
        $(OBJS)\corelib_menucmn.obj &\r
-       $(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 &\r
+       $(OBJS)\corelib_nbkbase.obj &\r
+       $(OBJS)\corelib_overlaycmn.obj &\r
+       $(OBJS)\corelib_ownerdrwcmn.obj &\r
+       $(OBJS)\corelib_paper.obj &\r
+       $(OBJS)\corelib_persist.obj &\r
+       $(OBJS)\corelib_pickerbase.obj &\r
        $(OBJS)\corelib_popupcmn.obj &\r
        $(OBJS)\corelib_prntbase.obj &\r
        $(OBJS)\corelib_quantize.obj &\r
@@ -7737,17 +7737,17 @@ $(OBJS)\monodll_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
-!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\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_ownerdrwcmn.obj :  .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monodll_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<\r
+!endif\r
 \r
 !ifeq USE_GUI 1\r
 $(OBJS)\monodll_persist.obj :  .AUTODEPEND ..\..\src\common\persist.cpp\r
@@ -9919,17 +9919,17 @@ $(OBJS)\monolib_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
-!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\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_ownerdrwcmn.obj :  .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\monolib_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<\r
+!endif\r
 \r
 !ifeq USE_GUI 1\r
 $(OBJS)\monolib_persist.obj :  .AUTODEPEND ..\..\src\common\persist.cpp\r
@@ -12104,17 +12104,17 @@ $(OBJS)\coredll_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
-!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\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_ownerdrwcmn.obj :  .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\coredll_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<\r
+!endif\r
 \r
 !ifeq USE_GUI 1\r
 $(OBJS)\coredll_persist.obj :  .AUTODEPEND ..\..\src\common\persist.cpp\r
@@ -13383,17 +13383,17 @@ $(OBJS)\corelib_nbkbase.obj :  .AUTODEPEND ..\..\src\common\nbkbase.cpp
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_overlaycmn.obj :  .AUTODEPEND ..\..\src\common\overlaycmn.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
-!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\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_ownerdrwcmn.obj :  .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
+\r
+!ifeq USE_GUI 1\r
+$(OBJS)\corelib_paper.obj :  .AUTODEPEND ..\..\src\common\paper.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<\r
+!endif\r
 \r
 !ifeq USE_GUI 1\r
 $(OBJS)\corelib_persist.obj :  .AUTODEPEND ..\..\src\common\persist.cpp\r
index 51daa5b9d672c1b48acf1219a23ea2da9a5a4af4..018da58d55321bfb9848e521a568a624a7c9c555 100644 (file)
@@ -1219,6 +1219,10 @@ SOURCE=..\..\include\wx\event.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\include\wx\evtloop.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\except.h\r
 # End Source File\r
 # Begin Source File\r
index d72ce20ed272840fd3d5a1996e79ad7c73614459..4a4eb9d38bd7fafb1f7979d7403ab72072149067 100644 (file)
@@ -562,10 +562,10 @@ SOURCE=..\..\src\common\overlaycmn.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\common\ownerdrwcmn.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\src\common\ownerdrwcmn.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\paper.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -5075,10 +5075,10 @@ SOURCE=..\..\include\wx\msw\ole\oleutils.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\msw\ownerdrw.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\msw\ownerdrw.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\msw\palette.h\r
 # End Source File\r
 # Begin Source File\r
@@ -5967,10 +5967,6 @@ SOURCE=..\..\include\wx\encinfo.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\evtloop.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\include\wx\evtloopsrc.h\r
 # End Source File\r
 # Begin Source File\r
index a6c458589b974d94e652eb38f4d29ceaa9637f28..330fd23a28a3f89a3604a4ae1401f00422f6fb48 100644 (file)
                        <File\r
                                RelativePath="..\..\include\wx\event.h">\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\evtloop.h">\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\except.h">\r
                        </File>\r
index 49348c7a7abd1cfce19c64d45de7f79c08a597e9..f90ff7608ecaed9727e5e28735da80d94b7381ee 100644 (file)
                                RelativePath="..\..\src\common\overlaycmn.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\common\ownerdrwcmn.cpp">
-                       </File>
-                       <File
+                               RelativePath="..\..\src\common\ownerdrwcmn.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\common\paper.cpp">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\msw\ole\oleutils.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\ownerdrw.h">
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\ownerdrw.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\msw\palette.h">\r
                        </File>\r
                        <File\r
                        <File\r
                                RelativePath="..\..\include\wx\encinfo.h">\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\evtloop.h">\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\evtloopsrc.h">\r
                        </File>\r
index 7fc30c7f28de0b9cbcba02ed31f8c14d874ee161..740982de6db603a1159898e7061181b68c035986 100644 (file)
@@ -27,7 +27,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
@@ -48,7 +48,7 @@
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
@@ -58,7 +58,7 @@
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
@@ -83,7 +83,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                MinimalRebuild="TRUE"\r
                                ExceptionHandling="TRUE"\r
                                BasicRuntimeChecks="3"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="TRUE"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="TRUE"\r
                                SuppressStartupBanner="TRUE"/>\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"/>\r
                                Name="VCPreLinkEventTool"/>\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"/>\r
                        <Tool\r
index 2ff7a8984f4d29d160a2d26375825c89c0e178ee..e124bcebb08d124f74fe880eb002938dfa0091e9 100644 (file)
                                RelativePath="..\..\include\wx\event.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\evtloop.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\except.h"\r
                                >\r
index 817e71e2ac61f5d322d4a23c644d88c9478bf368..64fc2acd36c88b5a9195693fc8be11312c942f69 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\common\ownerdrwcmn.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\common\ownerdrwcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\common\paper.cpp"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\ownerdrw.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\ownerdrw.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\msw\palette.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\encinfo.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\evtloop.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\evtloopsrc.h"\r
                                >\r
index 66bf0dabfe772a19dd84472ee177d1cd7b0ea4c1..7b20fc8bc88a364355c195217cb7357b123da803 100644 (file)
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
@@ -69,7 +69,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
index c8b41a45f9d4900bcba823f27f7d5200b4643815..7c36be035e69c510776e4d5f28f7b33ebef50613 100644 (file)
                                RelativePath="..\..\include\wx\event.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\wx\evtloop.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\except.h"\r
                                >\r
index 9492ec5dadae37ed5721a8248ac7abe2839eab45..970d2c4bb006e69099cff9953e746c58de7f366f 100644 (file)
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\src\common\ownerdrwcmn.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\src\common\ownerdrwcmn.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\src\common\paper.cpp"\r
                                >\r
                        </File>\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\include\wx\msw\ownerdrw.h"
-                               >
-                       </File>
-                       <File
+                               RelativePath="..\..\include\wx\msw\ownerdrw.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\include\wx\msw\palette.h"\r
                                >\r
                        </File>\r
                                RelativePath="..\..\include\wx\encinfo.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath="..\..\include\wx\evtloop.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath="..\..\include\wx\evtloopsrc.h"\r
                                >\r
index 723a13316410a24c44fbb72c407d96d22eb7aa78..84ad25d5c969028001b289b746e8d50f9dca19ea 100644 (file)
@@ -43,7 +43,7 @@
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
@@ -51,7 +51,7 @@
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
@@ -68,7 +68,7 @@
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               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"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               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"\r
                                ExceptionHandling="1"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="3"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="_DEBUG;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        />\r
                        <Tool\r
                                Name="VCMIDLTool"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
                        <Tool\r
                                AdditionalOptions="/MP"\r
                                Optimization="2"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
-                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="WIN32;_LIB;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                ExceptionHandling="1"\r
                                RuntimeLibrary="2"\r
                                RuntimeTypeInfo="true"\r
                        />\r
                        <Tool\r
                                Name="VCResourceCompilerTool"\r
-                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"
+                               PreprocessorDefinitions="NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS"\r
                                Culture="1033"\r
                                AdditionalIncludeDirectories="..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff"\r
                        />\r
index a5c250b4d7a2761a402f199ff7e367780f5f1c34..3273be1a4dc9d1115fd44bb0e40becaa442a4285 100644 (file)
@@ -46,8 +46,8 @@ RSC=rc.exe
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivudll\wxtiff"\r
 # PROP Target_Dir ""\r
-# 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\r
+# 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\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -69,8 +69,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswunivuddll\wxtiff"\r
 # PROP Target_Dir ""\r
-# 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\r
+# 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\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -92,8 +92,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswudll\wxtiff"\r
 # PROP Target_Dir ""\r
-# 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\r
+# 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\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -115,8 +115,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_dll"\r
 # PROP Intermediate_Dir "vc_mswuddll\wxtiff"\r
 # PROP Target_Dir ""\r
-# 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\r
+# 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\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -138,8 +138,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivu\wxtiff"\r
 # PROP Target_Dir ""\r
-# 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\r
+# 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\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -161,8 +161,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswunivud\wxtiff"\r
 # PROP Target_Dir ""\r
-# 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\r
+# 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\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -184,8 +184,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswu\wxtiff"\r
 # PROP Target_Dir ""\r
-# 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\r
+# 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\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
@@ -207,8 +207,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\..\lib\vc_lib"\r
 # PROP Intermediate_Dir "vc_mswud\wxtiff"\r
 # PROP Target_Dir ""\r
-# 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\r
+# 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\r
 # ADD BASE RSC /l 0x409\r
 # ADD RSC /l 0x409\r
 BSC32=bscmake.exe\r
index e180bce148a25c9ee104c4c23fa678f193502110..6e906aa01d491c4e571ec2d653f435dda6b76f56 100644 (file)
@@ -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
index 32ecaadceb9a9de5bf0b820191fc216299804d1a..e5708a4c2eda3da6fd0a213e787e7c827d3fa18f 100644 (file)
@@ -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
index bf79d96c4f5387ee9cbb7509b8c2f45225cecdea..4af78798b0f39ea4b19e8c8a449b274f3eee5e66 100644 (file)
@@ -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