From c7f476c90d91455e961a2149cd8298c3b2f0dcd1 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Mon, 8 Aug 2005 13:34:42 +0000 Subject: [PATCH] Copy univ/setup.h instead of msw/setup.h for wxUniversal in VC++ project files. Fixes bug 1230504. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/common.bkl | 57 ++++++++---- build/msw/wx_adv.dsp | 153 ++++++++++++++++++++++++++----- build/msw/wx_base.dsp | 183 +++++++++++++++++++++++++++++-------- build/msw/wx_core.dsp | 183 +++++++++++++++++++++++++++++-------- build/msw/wx_dbgrid.dsp | 153 ++++++++++++++++++++++++++----- build/msw/wx_gl.dsp | 153 ++++++++++++++++++++++++++----- build/msw/wx_html.dsp | 183 +++++++++++++++++++++++++++++-------- build/msw/wx_media.dsp | 153 ++++++++++++++++++++++++++----- build/msw/wx_net.dsp | 153 ++++++++++++++++++++++++++----- build/msw/wx_odbc.dsp | 153 ++++++++++++++++++++++++++----- build/msw/wx_qa.dsp | 153 ++++++++++++++++++++++++++----- build/msw/wx_wxregex.dsp | 153 ++++++++++++++++++++++++++----- build/msw/wx_xml.dsp | 153 ++++++++++++++++++++++++++----- build/msw/wx_xrc.dsp | 183 +++++++++++++++++++++++++++++-------- 14 files changed, 1765 insertions(+), 401 deletions(-) diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl index e5b335b568..fb21fce496 100644 --- a/build/bakefiles/common.bkl +++ b/build/bakefiles/common.bkl @@ -332,31 +332,56 @@ - - - wx/msw/wince/setup.h - wince\setup.h - wince_setup_h - - - wx/msw/setup.h - setup.h - setup_h - + - - include\wx\msw\$(vc_setup_h) - - Creating $(SETUPHDIR)\wx\setup.h -InputPath=..\include\wx\msw\$(vc_setup_h) +InputPath=..\include\wx\%s "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)" $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h + + + + + + + $(addPrefixToList('wx/', value)) + + + $(nativePaths(addPrefixToList('include/wx/', value))) + + + + + msw/wince/setup.h + + + $(msvc_copy_setup_h_script % 'msw\wince\setup.h') + + + + + msw/setup.h + univ/setup.h + + + + $(msvc_copy_setup_h_script % 'msw\setup.h') + + + + + $(msvc_copy_setup_h_script % 'univ\setup.h') + + + + + + diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index 8031443db6..af6f3acb9c 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -660,12 +660,12 @@ SOURCE=..\..\src\generic\wizard.cpp # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\msw\setup.h +SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -675,7 +675,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -685,7 +685,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -695,7 +695,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -704,6 +704,125 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release" +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\setup.h + +!IF "$(CFG)" == "adv - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "adv - Win32 DLL Unicode Release" + # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h InputPath=..\include\wx\msw\setup.h @@ -744,41 +863,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "adv - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "adv - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "adv - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp index 434f2100aa..a0c501b1b8 100644 --- a/build/msw/wx_base.dsp +++ b/build/msw/wx_base.dsp @@ -842,41 +842,25 @@ SOURCE=..\..\include\wx\msw\setup.h !IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build @@ -922,41 +906,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "base - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "base - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build @@ -1002,6 +970,141 @@ InputPath=..\include\wx\msw\setup.h !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\univ\setup.h + +!IF "$(CFG)" == "base - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 DLL Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "base - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + # End Source File # End Group # Begin Group "MSW Headers" diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 95ee83b361..db83d1c1ca 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -7134,41 +7134,25 @@ SOURCE=..\..\include\wx\msw\setup.h !IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build @@ -7214,41 +7198,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "core - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "core - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build @@ -7294,6 +7262,141 @@ InputPath=..\include\wx\msw\setup.h !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\univ\setup.h + +!IF "$(CFG)" == "core - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "core - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + # End Source File # End Group # Begin Group "MSW Headers" diff --git a/build/msw/wx_dbgrid.dsp b/build/msw/wx_dbgrid.dsp index 64175ac501..dd3018500f 100644 --- a/build/msw/wx_dbgrid.dsp +++ b/build/msw/wx_dbgrid.dsp @@ -533,12 +533,12 @@ SOURCE=..\..\src\msw\version.rc # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\msw\setup.h +SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -548,7 +548,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -558,7 +558,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -568,7 +568,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -577,6 +577,125 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release" +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\setup.h + +!IF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Universal Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "dbgrid - Win32 DLL Unicode Release" + # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h InputPath=..\include\wx\msw\setup.h @@ -617,41 +736,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "dbgrid - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build diff --git a/build/msw/wx_gl.dsp b/build/msw/wx_gl.dsp index 4f94bd4a7c..f0df18dbd8 100644 --- a/build/msw/wx_gl.dsp +++ b/build/msw/wx_gl.dsp @@ -529,12 +529,12 @@ SOURCE=..\..\src\msw\version.rc # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\msw\setup.h +SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -544,7 +544,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -554,7 +554,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -564,7 +564,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -573,6 +573,125 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release" +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\setup.h + +!IF "$(CFG)" == "gl - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 DLL Universal Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "gl - Win32 DLL Unicode Release" + # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h InputPath=..\include\wx\msw\setup.h @@ -613,41 +732,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "gl - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "gl - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "gl - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build diff --git a/build/msw/wx_html.dsp b/build/msw/wx_html.dsp index 2db8c33751..dc8319884a 100644 --- a/build/msw/wx_html.dsp +++ b/build/msw/wx_html.dsp @@ -625,41 +625,25 @@ SOURCE=..\..\include\wx\msw\setup.h !IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build @@ -705,41 +689,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "html - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "html - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build @@ -785,6 +753,141 @@ InputPath=..\include\wx\msw\setup.h !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\univ\setup.h + +!IF "$(CFG)" == "html - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 DLL Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "html - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + # End Source File # End Group # Begin Group "wxHTML Headers" diff --git a/build/msw/wx_media.dsp b/build/msw/wx_media.dsp index 3098fc1110..b1d81489c7 100644 --- a/build/msw/wx_media.dsp +++ b/build/msw/wx_media.dsp @@ -537,12 +537,12 @@ SOURCE=..\..\src\msw\version.rc # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\msw\setup.h +SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -552,7 +552,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -562,7 +562,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -572,7 +572,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -581,6 +581,125 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release" +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\setup.h + +!IF "$(CFG)" == "media - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 DLL Universal Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "media - Win32 DLL Unicode Release" + # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h InputPath=..\include\wx\msw\setup.h @@ -621,41 +740,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "media - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "media - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "media - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build diff --git a/build/msw/wx_net.dsp b/build/msw/wx_net.dsp index 1ab41a0f0f..b7d726f228 100644 --- a/build/msw/wx_net.dsp +++ b/build/msw/wx_net.dsp @@ -577,12 +577,12 @@ SOURCE=..\..\src\msw\version.rc # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\msw\setup.h +SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -592,7 +592,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -602,7 +602,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -612,7 +612,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -621,6 +621,125 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release" +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\setup.h + +!IF "$(CFG)" == "net - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 DLL Universal Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "net - Win32 DLL Unicode Release" + # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h InputPath=..\include\wx\msw\setup.h @@ -661,41 +780,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "net - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "net - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "net - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build diff --git a/build/msw/wx_odbc.dsp b/build/msw/wx_odbc.dsp index 5b82cc7dff..9d6593fce5 100644 --- a/build/msw/wx_odbc.dsp +++ b/build/msw/wx_odbc.dsp @@ -537,12 +537,12 @@ SOURCE=..\..\src\msw\version.rc # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\msw\setup.h +SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -552,7 +552,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -562,7 +562,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -572,7 +572,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -581,6 +581,125 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release" +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\setup.h + +!IF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 DLL Universal Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "odbc - Win32 DLL Unicode Release" + # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h InputPath=..\include\wx\msw\setup.h @@ -621,41 +740,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "odbc - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "odbc - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "odbc - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build diff --git a/build/msw/wx_qa.dsp b/build/msw/wx_qa.dsp index 4f90186ee9..89ce95f9d8 100644 --- a/build/msw/wx_qa.dsp +++ b/build/msw/wx_qa.dsp @@ -541,12 +541,12 @@ SOURCE=..\..\src\generic\dbgrptg.cpp # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\msw\setup.h +SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -556,7 +556,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -566,7 +566,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -576,7 +576,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -585,6 +585,125 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release" +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\setup.h + +!IF "$(CFG)" == "qa - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 DLL Universal Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "qa - Win32 DLL Unicode Release" + # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h InputPath=..\include\wx\msw\setup.h @@ -625,41 +744,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "qa - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "qa - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "qa - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build diff --git a/build/msw/wx_wxregex.dsp b/build/msw/wx_wxregex.dsp index bdb9ffa9ec..b3eae4fc8d 100644 --- a/build/msw/wx_wxregex.dsp +++ b/build/msw/wx_wxregex.dsp @@ -455,12 +455,12 @@ SOURCE=..\..\src\regex\regfree.c # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\msw\setup.h +SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -470,7 +470,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -480,7 +480,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -490,7 +490,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -499,6 +499,125 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release" +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\setup.h + +!IF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Universal Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "wxregex - Win32 DLL Unicode Release" + # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h InputPath=..\include\wx\msw\setup.h @@ -539,41 +658,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "wxregex - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build diff --git a/build/msw/wx_xml.dsp b/build/msw/wx_xml.dsp index d336717099..0ff6708eaa 100644 --- a/build/msw/wx_xml.dsp +++ b/build/msw/wx_xml.dsp @@ -533,12 +533,12 @@ SOURCE=..\..\src\msw\version.rc # PROP Default_Filter "" # Begin Source File -SOURCE=..\..\include\wx\msw\setup.h +SOURCE=..\..\include\wx\univ\setup.h !IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h @@ -548,7 +548,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h @@ -558,7 +558,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h @@ -568,7 +568,7 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug" # Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h +InputPath=..\include\wx\univ\setup.h "..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h @@ -577,6 +577,125 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release" +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\msw\setup.h + +!IF "$(CFG)" == "xml - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 DLL Universal Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xml - Win32 DLL Unicode Release" + # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h InputPath=..\include\wx\msw\setup.h @@ -617,41 +736,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "xml - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "xml - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "xml - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp index e0a1cd2e67..532df95b83 100644 --- a/build/msw/wx_xrc.dsp +++ b/build/msw/wx_xrc.dsp @@ -529,41 +529,25 @@ SOURCE=..\..\include\wx\msw\setup.h !IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build @@ -609,41 +593,25 @@ InputPath=..\include\wx\msw\setup.h !ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "xrc - Win32 Universal Release" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h +# Begin Custom Build - # End Custom Build !ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug" -# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h -InputPath=..\include\wx\msw\setup.h - -"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h +# Begin Custom Build - # End Custom Build @@ -689,6 +657,141 @@ InputPath=..\include\wx\msw\setup.h !ENDIF +# End Source File +# Begin Source File + +SOURCE=..\..\include\wx\univ\setup.h + +!IF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 DLL Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_dll\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_dll\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_dll\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 DLL Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 DLL Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivu\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivu\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 Universal Unicode Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivud\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivud\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 Universal Release" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswuniv\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswuniv\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswuniv\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 Universal Debug" + +# Begin Custom Build - Creating ..\..\lib\vc_lib\mswunivd\wx\setup.h +InputPath=..\include\wx\univ\setup.h + +"..\..\lib\vc_lib\mswunivd\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + copy "$(InputPath)" ..\..\lib\vc_lib\mswunivd\wx\setup.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 Unicode Debug" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 Release" + +# Begin Custom Build - + +# End Custom Build + +!ELSEIF "$(CFG)" == "xrc - Win32 Debug" + +# Begin Custom Build - + +# End Custom Build + +!ENDIF + # End Source File # End Group # Begin Group "Common Headers" -- 2.45.2