Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy univ/setup.h instead of msw/setup.h for wxUniversal in VC++ project

Browse Source 
files. Fixes bug 1230504.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2005-08-08 13:34:42 +00:00
parent 2edad6fc48
commit c7f476c90d
14 changed files with 1765 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
build/msw/wx_wxregex.dsp
View File

@@ -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