Don't include wxUniversal configurations in MSVC project files.
wxUniversal is practically not used under MSW and just confuses people. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,12 +17,8 @@ CFG=wxjpeg - Win32 Debug
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "wxjpeg - Win32 DLL Universal Release" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxjpeg - Win32 DLL Universal Debug" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxjpeg - Win32 DLL Release" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxjpeg - Win32 DLL Debug" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxjpeg - Win32 Universal Release" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxjpeg - Win32 Universal Debug" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxjpeg - Win32 Release" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxjpeg - Win32 Debug" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE
|
||||
@@ -34,53 +30,7 @@ CFG=wxjpeg - Win32 Debug
|
||||
CPP=cl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "wxjpeg - Win32 DLL Universal Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "..\..\lib\vc_dll"
|
||||
# PROP BASE Intermediate_Dir "vc_mswunivudll\wxjpeg"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "..\..\lib\vc_dll"
|
||||
# PROP Intermediate_Dir "vc_mswunivudll\wxjpeg"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c
|
||||
# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_dll\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpeg.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Universal Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "..\..\lib\vc_dll"
|
||||
# PROP BASE Intermediate_Dir "vc_mswunivuddll\wxjpeg"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "..\..\lib\vc_dll"
|
||||
# PROP Intermediate_Dir "vc_mswunivuddll\wxjpeg"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c
|
||||
# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_dll\wxjpegd.pdb /I "..\..\lib\vc_dll\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxjpeg - Win32 DLL Release"
|
||||
!IF "$(CFG)" == "wxjpeg - Win32 DLL Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
@@ -126,52 +76,6 @@ LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib\vc_dll\wxjpegd.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "..\..\lib\vc_lib"
|
||||
# PROP BASE Intermediate_Dir "vc_mswunivu\wxjpeg"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "..\..\lib\vc_lib"
|
||||
# PROP Intermediate_Dir "vc_mswunivu\wxjpeg"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c
|
||||
# ADD CPP /nologo /FD /MD /W1 /O2 /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpeg.pdb /opt:ref /opt:icf /I "..\..\lib\vc_lib\mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpeg.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxjpeg - Win32 Universal Debug"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "..\..\lib\vc_lib"
|
||||
# PROP BASE Intermediate_Dir "vc_mswunivud\wxjpeg"
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "..\..\lib\vc_lib"
|
||||
# PROP Intermediate_Dir "vc_mswunivud\wxjpeg"
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c
|
||||
# ADD CPP /nologo /FD /MDd /W1 /Od /Gm /GR /EHsc /Zi /Fd..\..\lib\vc_lib\wxjpegd.pdb /I "..\..\lib\vc_lib\mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "NDEBUG" /D "_CRT_SECURE_NO_WARNINGS" /c
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
|
||||
# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxjpegd.lib"
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxjpeg - Win32 Release"
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
@@ -222,12 +126,8 @@ LIB32=link.exe -lib
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "wxjpeg - Win32 DLL Universal Release"
|
||||
# Name "wxjpeg - Win32 DLL Universal Debug"
|
||||
# Name "wxjpeg - Win32 DLL Release"
|
||||
# Name "wxjpeg - Win32 DLL Debug"
|
||||
# Name "wxjpeg - Win32 Universal Release"
|
||||
# Name "wxjpeg - Win32 Universal Debug"
|
||||
# Name "wxjpeg - Win32 Release"
|
||||
# Name "wxjpeg - Win32 Debug"
|
||||
# Begin Group "Source Files"
|
||||
|
Reference in New Issue
Block a user