Rebaked everything with bakefile 0.2.6 after wxRibbon merge.

0.2.5 versions of some makefiles were checked in, regenerate them using 0.2.6.

Also regenerate configure after autoconf_inc.m4 was updated.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-09-16 13:07:10 +00:00
parent 956b3d92ef
commit d33ccbe15c
38 changed files with 4409 additions and 4333 deletions

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.5 (http://www.bakefile.org)
# Bakefile 0.2.6 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -41,9 +41,9 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 2.9
WX_VERSION = $(WX_RELEASE).0
WX_VERSION = $(WX_RELEASE).1
LIBDIRNAME = $(wx_top_builddir)/lib
RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
RIBBON_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
@@ -60,8 +60,7 @@ RIBBON_OBJECTS = \
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@COND_BUILD_debug_DEBUG_FLAG_default@WXDEBUGFLAG = d
@COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
@COND_BUILD_debug@WXDEBUGFLAG = d
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_WXUNIV_1@WXUNIVNAME = univ
@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
@@ -73,6 +72,8 @@ RIBBON_OBJECTS = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ribbon$(EXEEXT)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
@@ -174,7 +175,7 @@ ribbon$(EXEEXT): $(RIBBON_OBJECTS) $(__ribbon___win32rc)
@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >ribbon.app/Contents/PkgInfo
@COND_PLATFORM_MACOSX_1@
@COND_PLATFORM_MACOSX_1@
@COND_PLATFORM_MACOSX_1@ mv ribbon$(EXEEXT) ribbon.app/Contents/MacOS/ribbon
@COND_PLATFORM_MACOSX_1@ ln -f ribbon$(EXEEXT) ribbon.app/Contents/MacOS/ribbon
@COND_PLATFORM_MACOSX_1@
@COND_PLATFORM_MACOSX_1@
@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns ribbon.app/Contents/Resources/wxmac.icns
@@ -185,18 +186,9 @@ ribbon_ribbondemo.o: $(srcdir)/ribbondemo.cpp
$(CXXC) -c -o $@ $(RIBBON_CXXFLAGS) $(srcdir)/ribbondemo.cpp
ribbon_sample_rc.o: $(srcdir)/../sample.rc
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
@COND_USE_STC_1@$(srcdir)/include/wx/stc/stc.h: \
@COND_USE_STC_1@$(srcdir)/src/stc/scintilla/include/Scintilla.iface \
@COND_USE_STC_1@$(srcdir)/src/stc/stc.cpp.in \
@COND_USE_STC_1@$(srcdir)/src/stc/stc.h.in \
@COND_USE_STC_1@$(srcdir)/src/stc/gen_iface.py
@COND_USE_STC_1@ cd $(srcdir)/src/stc && ./gen_iface.py
@COND_USE_STC_1@monolib_stc.o monodll_stc.o stcdll_stc.o stclib_stc.o: \
@COND_USE_STC_1@ $(srcdir)/include/wx/stc/stc.h
# Include dependency info, if present:
@IF_GNU_MAKE@-include ./.deps/*.d

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.5 (http://www.bakefile.org)
# Bakefile 0.2.6 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -45,10 +45,7 @@ PORTNAME = base
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
!if "$(BUILD)" == "debug"
WXDEBUGFLAG = d
!endif
!if "$(UNICODE)" == "1"
@@ -108,17 +105,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!if "$(DEBUG_FLAG)" == "0"
__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = -D__WXDEBUG__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
!if "$(DEBUG_FLAG)" == "0"
__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
!endif
!if "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.5 (http://www.bakefile.org)
# Bakefile 0.2.6 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -43,11 +43,6 @@ ifeq ($(USE_GUI),1)
PORTNAME = msw
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
WXDEBUGFLAG = d
endif
endif
ifeq ($(DEBUG_FLAG),1)
WXDEBUGFLAG = d
endif
ifeq ($(UNICODE),1)
@@ -95,21 +90,11 @@ endif
ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
__DEBUG_DEFINE_p = -D__WXDEBUG__
ifeq ($(DEBUG_FLAG),0)
__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
endif
endif
ifeq ($(DEBUG_FLAG),1)
__DEBUG_DEFINE_p = -D__WXDEBUG__
endif
ifeq ($(BUILD),debug)
ifeq ($(DEBUG_FLAG),default)
__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
endif
endif
ifeq ($(DEBUG_FLAG),1)
__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
ifeq ($(DEBUG_FLAG),0)
__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
endif
ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.5 (http://www.bakefile.org)
# Bakefile 0.2.6 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -11,7 +11,7 @@
# -------------------------------------------------------------------------
# C++ compiler
CXX = g++
CXX = `$(WX_CONFIG) --cxx`
# Standard flags for C++
CXXFLAGS ?=
@@ -26,19 +26,16 @@ LDFLAGS ?=
WX_CONFIG ?= wx-config
# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,mac,dfb]
WX_PORT ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 1)
WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
# Use DLL build of wx library to use? [0,1]
WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --selected-config | cut -d '-' -f 5`; then echo 1; else echo 0; fi)
WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi)
# Compile Unicode build of wxWidgets? [0,1]
WX_UNICODE ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 2 | sed 's/unicode/1/;s/ansi/0/')
# Use debug build of wxWidgets (define __WXDEBUG__)? [0,1]
WX_DEBUG ?= $(shell $(WX_CONFIG) --selected-config | cut -d '-' -f 3 | sed 's/debug/1/;s/release/0/')
WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/')
# Version of the wx library to build against.
WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.\([0-9]*\)$$/\1\2/')
WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')
@@ -51,9 +48,8 @@ WX_VERSION ?= $(shell $(WX_CONFIG) --selected-config | sed -e 's/.*-\([0-9]*\)\.
CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
WX_CONFIG_FLAGS = $(WX_CONFIG_DEBUG_FLAG) $(WX_CONFIG_UNICODE_FLAG) \
$(WX_CONFIG_SHARED_FLAG) --toolkit=$(WX_PORT) \
--version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \
--toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
RIBBON_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
$(CXXFLAGS)
RIBBON_OBJECTS = \
@@ -61,12 +57,6 @@ RIBBON_OBJECTS = \
### Conditionally set variables: ###
ifeq ($(WX_DEBUG),0)
WX_CONFIG_DEBUG_FLAG = --debug=no
endif
ifeq ($(WX_DEBUG),1)
WX_CONFIG_DEBUG_FLAG = --debug=yes
endif
ifeq ($(WX_UNICODE),0)
WX_CONFIG_UNICODE_FLAG = --unicode=no
endif

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.5 (http://www.bakefile.org)
# Bakefile 0.2.6 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -40,10 +40,10 @@ PORTNAME = base
!if "$(USE_GUI)" == "1"
PORTNAME = msw
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
WXDEBUGFLAG = d
!endif
!if "$(DEBUG_FLAG)" == "1"
!if "$(DEBUG_RUNTIME_LIBS)" == "1"
WXDEBUGFLAG = d
!endif
!if "$(UNICODE)" == "1"
@@ -199,17 +199,11 @@ __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!if "$(DEBUG_FLAG)" == "0"
__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p = /D__WXDEBUG__
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
!endif
!if "$(DEBUG_FLAG)" == "1"
__DEBUG_DEFINE_p_1 = /d __WXDEBUG__
!if "$(DEBUG_FLAG)" == "0"
__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
!endif
!if "$(USE_EXCEPTIONS)" == "0"
__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.5 (http://www.bakefile.org)
# Bakefile 0.2.6 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -18,7 +18,11 @@
! loaddll wpp wppdi86
! loaddll wppaxp wppdaxp
! loaddll wpp386 wppd386
! if $(__VERSION__) >= 1280
! loaddll wlink wlinkd
! else
! loaddll wlink wlink
! endif
! loaddll wlib wlibd
!endif
@@ -36,11 +40,6 @@ PORTNAME = msw
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
WXDEBUGFLAG = d
!endif
!endif
!ifeq DEBUG_FLAG 1
WXDEBUGFLAG = d
!endif
WXUNICODEFLAG =
@@ -184,13 +183,8 @@ __WXUNIV_DEFINE_p =
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
!endif
__DEBUG_DEFINE_p =
!ifeq BUILD debug
!ifeq DEBUG_FLAG default
__DEBUG_DEFINE_p = -d__WXDEBUG__
!endif
!endif
!ifeq DEBUG_FLAG 1
__DEBUG_DEFINE_p = -d__WXDEBUG__
!ifeq DEBUG_FLAG 0
__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
!endif
__EXCEPTIONS_DEFINE_p =
!ifeq USE_EXCEPTIONS 0

View File

@@ -72,12 +72,12 @@ LINK32=link.exe
# PROP Output_Dir "vc_mswunivuddll"
# PROP Intermediate_Dir "vc_mswunivuddll\ribbon"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -122,12 +122,12 @@ LINK32=link.exe
# PROP Output_Dir "vc_mswuddll"
# PROP Intermediate_Dir "vc_mswuddll\ribbon"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -172,12 +172,12 @@ LINK32=link.exe
# PROP Output_Dir "vc_mswunivud"
# PROP Intermediate_Dir "vc_mswunivud\ribbon"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -222,12 +222,12 @@ LINK32=link.exe
# PROP Output_Dir "vc_mswud"
# PROP Intermediate_Dir "vc_mswud\ribbon"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\ribbon.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo

View File

@@ -3,32 +3,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "ribbon_vc7.vcproj
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
DLL Universal Release|Win32 = DLL Universal Release|Win32
DLL Universal Debug|Win32 = DLL Universal Debug|Win32
DLL Release|Win32 = DLL Release|Win32
DLL Debug|Win32 = DLL Debug|Win32
Universal Release|Win32 = Universal Release|Win32
Universal Debug|Win32 = Universal Debug|Win32
Release|Win32 = Release|Win32
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
Universal Debug|Win32 = Universal Debug|Win32
Universal Release|Win32 = Universal Release|Win32
DLL Debug|Win32 = DLL Debug|Win32
DLL Release|Win32 = DLL Release|Win32
DLL Universal Debug|Win32 = DLL Universal Debug|Win32
DLL Universal Release|Win32 = DLL Universal Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.Build.0 = DLL Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.Build.0 = Universal Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.ActiveCfg = Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.Build.0 = Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Debug|Win32.ActiveCfg = Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Debug|Win32.Build.0 = Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.ActiveCfg = Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Release|Win32.Build.0 = Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.Universal Release|Win32.Build.0 = Universal Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Release|Win32.Build.0 = DLL Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
{717E754A-A748-5A81-AA86-AA4640D51560}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="Windows-1252"?>
<!--
This makefile was generated by
Bakefile 0.2.5 (http://www.bakefile.org)
This project was generated by
Bakefile 0.2.6 (http://www.bakefile.org)
Do not modify, all changes will be overwritten!
-->
@@ -17,70 +17,9 @@
</Platforms>
<Configurations>
<Configuration
Name="DLL Universal Release|Win32"
OutputDirectory="vc_mswunivudll"
IntermediateDirectory="vc_mswunivudll\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivudll\ribbon\"
ObjectFile="vc_mswunivudll\ribbon\"
ProgramDataBaseFileName="vc_mswunivudll\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswunivudll\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
OutputDirectory="vc_mswunivuddll"
IntermediateDirectory="vc_mswunivuddll\ribbon"
Name="Debug|Win32"
OutputDirectory="vc_mswud"
IntermediateDirectory="vc_mswud\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -88,142 +27,16 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivuddll\ribbon\"
ObjectFile="vc_mswunivuddll\ribbon\"
ProgramDataBaseFileName="vc_mswunivuddll\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmswuniv29ud_ribbon.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswunivuddll\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
OutputDirectory="vc_mswudll"
IntermediateDirectory="vc_mswudll\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswudll\ribbon\"
ObjectFile="vc_mswudll\ribbon\"
ProgramDataBaseFileName="vc_mswudll\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
OutputDirectory="vc_mswuddll"
IntermediateDirectory="vc_mswuddll\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswuddll\ribbon\"
ObjectFile="vc_mswuddll\ribbon\"
ProgramDataBaseFileName="vc_mswuddll\ribbon.pdb"
ObjectFile="vc_mswud\ribbon\"
ProgramDataBaseFileName="vc_mswud\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -234,77 +47,18 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw29ud_ribbon.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswuddll\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
OutputDirectory="vc_mswunivu"
IntermediateDirectory="vc_mswunivu\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivu\ribbon\"
ObjectFile="vc_mswunivu\ribbon\"
ProgramDataBaseFileName="vc_mswunivu\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswunivu\ribbon.exe"
OutputFile="vc_mswud\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\ribbon.pdb"
ProgramDatabaseFile="vc_mswud\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -313,73 +67,9 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Debug|Win32"
OutputDirectory="vc_mswunivud"
IntermediateDirectory="vc_mswunivud\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswunivud\ribbon\"
ObjectFile="vc_mswunivud\ribbon\"
ProgramDataBaseFileName="vc_mswunivud\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmswuniv29ud_ribbon.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswunivud\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -403,11 +93,10 @@
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswu\ribbon\"
ObjectFile="vc_mswu\ribbon\"
ProgramDataBaseFileName="vc_mswu\ribbon.pdb"
WarningLevel="4"
@@ -429,7 +118,9 @@
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;_WINDOWS;NOPCH"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -453,9 +144,9 @@
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory="vc_mswud"
IntermediateDirectory="vc_mswud\ribbon"
Name="Universal Debug|Win32"
OutputDirectory="vc_mswunivud"
IntermediateDirectory="vc_mswunivud\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
@@ -463,17 +154,143 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
AssemblerListingLocation="vc_mswud\ribbon\"
ObjectFile="vc_mswud\ribbon\"
ProgramDataBaseFileName="vc_mswud\ribbon.pdb"
ObjectFile="vc_mswunivud\ribbon\"
ProgramDataBaseFileName="vc_mswunivud\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmswuniv29ud_ribbon.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswunivud\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivud\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivud;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Universal Release|Win32"
OutputDirectory="vc_mswunivu"
IntermediateDirectory="vc_mswunivu\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswunivu\ribbon\"
ProgramDataBaseFileName="vc_mswunivu\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswunivu\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivu\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Debug|Win32"
OutputDirectory="vc_mswuddll"
IntermediateDirectory="vc_mswuddll\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswuddll\ribbon\"
ProgramDataBaseFileName="vc_mswuddll\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
@@ -484,16 +301,18 @@
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw29ud_ribbon.lib wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\ribbon.exe"
OutputFile="vc_mswuddll\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_lib"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswud\ribbon.pdb"
ProgramDatabaseFile="vc_mswuddll\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
@@ -502,9 +321,198 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_WINDOWS;NOPCH"
PreprocessorDefinitions="_DEBUG;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_lib\mswud;.\..\..\include;.;.\..\..\samples"/>
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswud;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Release|Win32"
OutputDirectory="vc_mswudll"
IntermediateDirectory="vc_mswudll\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswudll\ribbon\"
ProgramDataBaseFileName="vc_mswudll\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmsw29u_ribbon.lib wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswudll\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswu;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Debug|Win32"
OutputDirectory="vc_mswunivuddll"
IntermediateDirectory="vc_mswunivuddll\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
MinimalRebuild="TRUE"
ExceptionHandling="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
BufferSecurityCheck="TRUE"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswunivuddll\ribbon\"
ProgramDataBaseFileName="vc_mswunivuddll\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmswuniv29ud_ribbon.lib wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswunivuddll\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivuddll\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivud;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="DLL Universal Release|Win32"
OutputDirectory="vc_mswunivudll"
IntermediateDirectory="vc_mswunivudll\ribbon"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"
PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
ExceptionHandling="TRUE"
RuntimeLibrary="2"
RuntimeTypeInfo="TRUE"
ObjectFile="vc_mswunivudll\ribbon\"
ProgramDataBaseFileName="vc_mswunivudll\ribbon.pdb"
WarningLevel="4"
SuppressStartupBanner="TRUE"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions=""
AdditionalDependencies="wxmswuniv29u_ribbon.lib wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"
OutputFile="vc_mswunivudll\ribbon.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\lib\vc_dll"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="vc_mswunivudll\ribbon.pdb"
SubSystem="2"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="WIN32;__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_WINDOWS;NOPCH"
Culture="1033"
AdditionalIncludeDirectories=".\..\..\lib\vc_dll\mswunivu;.\..\..\include;.;.\..\..\samples"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -534,7 +542,7 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
<File
RelativePath=".\..\sample.rc">
RelativePath="..\sample.rc">
</File>
</Filter>
</Files>

View File

@@ -4,32 +4,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "ribbon_vc8.vcproj
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
DLL Universal Release|Win32 = DLL Universal Release|Win32
DLL Universal Debug|Win32 = DLL Universal Debug|Win32
DLL Release|Win32 = DLL Release|Win32
DLL Debug|Win32 = DLL Debug|Win32
Universal Release|Win32 = Universal Release|Win32
Universal Debug|Win32 = Universal Debug|Win32
Release|Win32 = Release|Win32
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
Universal Debug|Win32 = Universal Debug|Win32
Universal Release|Win32 = Universal Release|Win32
DLL Debug|Win32 = DLL Debug|Win32
DLL Release|Win32 = DLL Release|Win32
DLL Universal Debug|Win32 = DLL Universal Debug|Win32
DLL Universal Release|Win32 = DLL Universal Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.Build.0 = DLL Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.Build.0 = Universal Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.ActiveCfg = Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.Build.0 = Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Debug|Win32.ActiveCfg = Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Debug|Win32.Build.0 = Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.ActiveCfg = Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Release|Win32.Build.0 = Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.Universal Release|Win32.Build.0 = Universal Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Release|Win32.Build.0 = DLL Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
{BA2417EE-232B-5AEC-9EBA-D4CEE724CE81}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

File diff suppressed because it is too large Load Diff

View File

@@ -4,32 +4,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "ribbon_vc9.vcproj
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
DLL Universal Release|Win32 = DLL Universal Release|Win32
DLL Universal Debug|Win32 = DLL Universal Debug|Win32
DLL Release|Win32 = DLL Release|Win32
DLL Debug|Win32 = DLL Debug|Win32
Universal Release|Win32 = Universal Release|Win32
Universal Debug|Win32 = Universal Debug|Win32
Release|Win32 = Release|Win32
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
Universal Debug|Win32 = Universal Debug|Win32
Universal Release|Win32 = Universal Release|Win32
DLL Debug|Win32 = DLL Debug|Win32
DLL Release|Win32 = DLL Release|Win32
DLL Universal Debug|Win32 = DLL Universal Debug|Win32
DLL Universal Release|Win32 = DLL Universal Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.Build.0 = DLL Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.Build.0 = Universal Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.ActiveCfg = Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.Build.0 = Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Debug|Win32.ActiveCfg = Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Debug|Win32.Build.0 = Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.ActiveCfg = Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Release|Win32.Build.0 = Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.ActiveCfg = Universal Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Debug|Win32.Build.0 = Universal Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.ActiveCfg = Universal Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.Universal Release|Win32.Build.0 = Universal Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Release|Win32.Build.0 = DLL Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.ActiveCfg = DLL Universal Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Debug|Win32.Build.0 = DLL Universal Debug|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.ActiveCfg = DLL Universal Release|Win32
{B56D7915-3E5D-5D62-9C6C-05DE05427191}.DLL Universal Release|Win32.Build.0 = DLL Universal Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

File diff suppressed because it is too large Load Diff