Intel C++ needs time.h before sys/stat.h

[wxWidgets.git] / build / wx_wxjpeg.dsp

diff --git a/build/wx_wxjpeg.dsp b/build/wx_wxjpeg.dsp
index bbc373643f6e7495cb29408843216886ba3d5bbc..43160d92cc8a4a7749b8b187cbc524eefaf7f6fd 100644 (file)
--- a/build/wx_wxjpeg.dsp
+++ b/build/wx_wxjpeg.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=wxjpeg - Win32 Static Native Release Unicode
+CFG=wxjpeg - Win32 LIB wxUniv Debug Unicode
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,26 +13,26 @@ CFG=wxjpeg - Win32 Static Native Release Unicode
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "wx_wxjpeg.mak" CFG="wxjpeg - Win32 Static Native Release Unicode"
+!MESSAGE NMAKE /f "wx_wxjpeg.mak" CFG="wxjpeg - Win32 LIB wxUniv Debug Unicode"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "wxjpeg - Win32 Static Native Release Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 LIB wxUniv Debug Unicode" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxjpeg - Win32 DLL Native Release Ansi" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxjpeg - Win32 DLL wxUniv Debug Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxjpeg - Win32 DLL wxUniv Release Ansi" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Static Native Release Ansi" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 LIB Native Debug Unicode" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxjpeg - Win32 DLL wxUniv Debug Ansi" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 LIB Native Debug Ansi" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxjpeg - Win32 DLL Native Release Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Static wxUniv Release Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 DLL wxUniv Release Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Static wxUniv Debug Ansi" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Static Native Debug Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Static wxUniv Release Ansi" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 LIB wxUniv Release Ansi" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 LIB Native Release Unicode" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 LIB wxUniv Debug Ansi" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 DLL Native Debug Unicode" (based on "Win32 (x86) Static Library")
 !MESSAGE "wxjpeg - Win32 DLL Native Debug Ansi" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Static wxUniv Debug Unicode" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxjpeg - Win32 Static Native Debug Ansi" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 LIB Native Release Ansi" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxjpeg - Win32 LIB wxUniv Release Unicode" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -42,28 +42,28 @@ CFG=wxjpeg - Win32 Static Native Release Unicode
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "wxjpeg - Win32 Static Native Release Unicode"
+!IF  "$(CFG)" == "wxjpeg - Win32 LIB wxUniv Debug Unicode"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\lib\vc_mswu\"
-# PROP BASE Intermediate_Dir "vc_mswu\wxjpeg"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\lib\vc_mswunivud\"
+# PROP BASE Intermediate_Dir "vc_mswunivud\wxjpeg"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\lib\vc_mswu\"
-# PROP Intermediate_Dir "vc_mswu\wxjpeg"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\lib\vc_mswunivud\"
+# PROP Intermediate_Dir "vc_mswunivud\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxjpeg.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswu\wxjpeg.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxjpegd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxjpegd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxjpeg.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxjpegd.lib"
 
 !ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Native Release Ansi"
 
@@ -77,8 +77,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswdll\"
 # PROP Intermediate_Dir "vc_mswdll\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxjpeg.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswdll\wxjpeg.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxjpeg.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswdll\wxjpeg.pdb /I "..\lib\vc_mswdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
@@ -100,8 +100,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivuddll\"
 # PROP Intermediate_Dir "vc_mswunivuddll\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxjpegd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxjpegd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxjpegd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivuddll\wxjpegd.pdb /I "..\lib\vc_mswunivuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
@@ -111,28 +111,28 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\lib\vc_mswunivuddll\wxjpegd.lib"
 
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Native Debug Unicode"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL wxUniv Release Unicode"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\lib\vc_mswuddll\"
-# PROP BASE Intermediate_Dir "vc_mswuddll\wxjpeg"
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\lib\vc_mswunivudll\"
+# 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_mswuddll\"
-# PROP Intermediate_Dir "vc_mswuddll\wxjpeg"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\lib\vc_mswunivudll\"
+# PROP Intermediate_Dir "vc_mswunivudll\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxjpegd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxjpegd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxjpeg.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivudll\wxjpeg.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxjpegd.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxjpeg.lib"
 
 !ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL wxUniv Release Ansi"
 
@@ -146,8 +146,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivdll\"
 # PROP Intermediate_Dir "vc_mswunivdll\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxjpeg.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivdll\wxjpeg.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxjpeg.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivdll\wxjpeg.pdb /I "..\lib\vc_mswunivdll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
@@ -157,28 +157,28 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\lib\vc_mswunivdll\wxjpeg.lib"
 
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Static Native Release Ansi"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 LIB Native Debug Unicode"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\lib\vc_msw\"
-# PROP BASE Intermediate_Dir "vc_msw\wxjpeg"
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\lib\vc_mswud\"
+# PROP BASE Intermediate_Dir "vc_mswud\wxjpeg"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\lib\vc_msw\"
-# PROP Intermediate_Dir "vc_msw\wxjpeg"
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\lib\vc_mswud\"
+# PROP Intermediate_Dir "vc_mswud\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxjpeg.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_msw\wxjpeg.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxjpegd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxjpegd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxjpeg.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxjpegd.lib"
 
 !ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL wxUniv Debug Ansi"
 
@@ -192,8 +192,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivddll\"
 # PROP Intermediate_Dir "vc_mswunivddll\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxjpegd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxjpegd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxjpegd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivddll\wxjpegd.pdb /I "..\lib\vc_mswunivddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
@@ -203,6 +203,29 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\lib\vc_mswunivddll\wxjpegd.lib"
 
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 LIB Native Debug Ansi"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\lib\vc_mswd\"
+# PROP BASE Intermediate_Dir "vc_mswd\wxjpeg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\lib\vc_mswd\"
+# PROP Intermediate_Dir "vc_mswd\wxjpeg"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxjpegd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxjpegd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE RSC /l 0x405
+# ADD RSC /l 0x405
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxjpegd.lib"
+
 !ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Native Release Unicode"
 
 # PROP BASE Use_MFC 0
@@ -215,8 +238,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswudll\"
 # PROP Intermediate_Dir "vc_mswudll\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxjpeg.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswudll\wxjpeg.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxjpeg.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswudll\wxjpeg.pdb /I "..\lib\vc_mswudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
@@ -226,53 +249,53 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswudll\wxjpeg.lib"
 # ADD LIB32 /nologo /out:"..\lib\vc_mswudll\wxjpeg.lib"
 
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Static wxUniv Release Unicode"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 LIB wxUniv Release Ansi"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\lib\vc_mswunivu\"
-# PROP BASE Intermediate_Dir "vc_mswunivu\wxjpeg"
+# PROP BASE Output_Dir "..\lib\vc_mswuniv\"
+# PROP BASE Intermediate_Dir "vc_mswuniv\wxjpeg"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\lib\vc_mswunivu\"
-# PROP Intermediate_Dir "vc_mswunivu\wxjpeg"
+# PROP Output_Dir "..\lib\vc_mswuniv\"
+# PROP Intermediate_Dir "vc_mswuniv\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxjpeg.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivu\wxjpeg.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxjpeg.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswuniv\wxjpeg.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxjpeg.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxjpeg.lib"
 
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL wxUniv Release Unicode"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 LIB Native Release Unicode"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\lib\vc_mswunivudll\"
-# PROP BASE Intermediate_Dir "vc_mswunivudll\wxjpeg"
+# PROP BASE Output_Dir "..\lib\vc_mswu\"
+# PROP BASE Intermediate_Dir "vc_mswu\wxjpeg"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\lib\vc_mswunivudll\"
-# PROP Intermediate_Dir "vc_mswunivudll\wxjpeg"
+# PROP Output_Dir "..\lib\vc_mswu\"
+# PROP Intermediate_Dir "vc_mswu\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxjpeg.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswunivudll\wxjpeg.pdb /I "..\lib\vc_mswunivudll" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxjpeg.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswu\wxjpeg.pdb /I "..\lib\vc_mswu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswunivudll\wxjpeg.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswu\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswu\wxjpeg.lib"
 
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Static wxUniv Debug Ansi"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 LIB wxUniv Debug Ansi"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -284,8 +307,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswunivd\"
 # PROP Intermediate_Dir "vc_mswunivd\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxjpegd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxjpegd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxjpegd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivd\wxjpegd.pdb /I "..\lib\vc_mswunivd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
@@ -295,51 +318,28 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivd\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\lib\vc_mswunivd\wxjpegd.lib"
 
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Static Native Debug Unicode"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Native Debug Unicode"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\lib\vc_mswud\"
-# PROP BASE Intermediate_Dir "vc_mswud\wxjpeg"
+# PROP BASE Output_Dir "..\lib\vc_mswuddll\"
+# PROP BASE Intermediate_Dir "vc_mswuddll\wxjpeg"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\lib\vc_mswud\"
-# PROP Intermediate_Dir "vc_mswud\wxjpeg"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxjpegd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswud\wxjpegd.pdb /I "..\lib\vc_mswud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD BASE RSC /l 0x405
-# ADD RSC /l 0x405
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswud\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswud\wxjpegd.lib"
-
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Static wxUniv Release Ansi"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\lib\vc_mswuniv\"
-# PROP BASE Intermediate_Dir "vc_mswuniv\wxjpeg"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\lib\vc_mswuniv\"
-# PROP Intermediate_Dir "vc_mswuniv\wxjpeg"
+# PROP Output_Dir "..\lib\vc_mswuddll\"
+# PROP Intermediate_Dir "vc_mswuddll\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxjpeg.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
-# ADD CPP /nologo /FD /MD /O1 /Fd..\lib\vc_mswuniv\wxjpeg.pdb /I "..\lib\vc_mswuniv" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxjpegd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswuddll\wxjpegd.pdb /I "..\lib\vc_mswuddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuniv\wxjpeg.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswuniv\wxjpeg.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswuddll\wxjpegd.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswuddll\wxjpegd.lib"
 
 !ELSEIF  "$(CFG)" == "wxjpeg - Win32 DLL Native Debug Ansi"
 
@@ -353,8 +353,8 @@ LIB32=link.exe -lib
 # PROP Output_Dir "..\lib\vc_mswddll\"
 # PROP Intermediate_Dir "vc_mswddll\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxjpegd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxjpegd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxjpegd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswddll\wxjpegd.pdb /I "..\lib\vc_mswddll" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
@@ -364,72 +364,72 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo /out:"..\lib\vc_mswddll\wxjpegd.lib"
 # ADD LIB32 /nologo /out:"..\lib\vc_mswddll\wxjpegd.lib"
 
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Static wxUniv Debug Unicode"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 LIB Native Release Ansi"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\lib\vc_mswunivud\"
-# PROP BASE Intermediate_Dir "vc_mswunivud\wxjpeg"
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\lib\vc_msw\"
+# PROP BASE Intermediate_Dir "vc_msw\wxjpeg"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\lib\vc_mswunivud\"
-# PROP Intermediate_Dir "vc_mswunivud\wxjpeg"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\lib\vc_msw\"
+# PROP Intermediate_Dir "vc_msw\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxjpegd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswunivud\wxjpegd.pdb /I "..\lib\vc_mswunivud" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxjpeg.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_msw\wxjpeg.pdb /I "..\lib\vc_msw" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivud\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswunivud\wxjpegd.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_msw\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_msw\wxjpeg.lib"
 
-!ELSEIF  "$(CFG)" == "wxjpeg - Win32 Static Native Debug Ansi"
+!ELSEIF  "$(CFG)" == "wxjpeg - Win32 LIB wxUniv Release Unicode"
 
 # PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\lib\vc_mswd\"
-# PROP BASE Intermediate_Dir "vc_mswd\wxjpeg"
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "..\lib\vc_mswunivu\"
+# 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_mswd\"
-# PROP Intermediate_Dir "vc_mswd\wxjpeg"
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "..\lib\vc_mswunivu\"
+# PROP Intermediate_Dir "vc_mswunivu\wxjpeg"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxjpegd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
-# ADD CPP /nologo /FD /MDd /Od /Zi /Gm /GZ /Fd..\lib\vc_mswd\wxjpegd.pdb /I "..\lib\vc_mswd" /D "WIN32" /D "_LIB" /D "_DEBUG" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxjpeg.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /Fd..\lib\vc_mswunivu\wxjpeg.pdb /I "..\lib\vc_mswunivu" /D "WIN32" /D "_LIB" /D "NDEBUG" /c
 # ADD BASE RSC /l 0x405
 # ADD RSC /l 0x405
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
 LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswd\wxjpegd.lib"
-# ADD LIB32 /nologo /out:"..\lib\vc_mswd\wxjpegd.lib"
+# ADD BASE LIB32 /nologo /out:"..\lib\vc_mswunivu\wxjpeg.lib"
+# ADD LIB32 /nologo /out:"..\lib\vc_mswunivu\wxjpeg.lib"
 
 !ENDIF
 
 # Begin Target
 
-# Name "wxjpeg - Win32 Static Native Release Unicode"
+# Name "wxjpeg - Win32 LIB wxUniv Debug Unicode"
 # Name "wxjpeg - Win32 DLL Native Release Ansi"
 # Name "wxjpeg - Win32 DLL wxUniv Debug Unicode"
-# Name "wxjpeg - Win32 DLL Native Debug Unicode"
+# Name "wxjpeg - Win32 DLL wxUniv Release Unicode"
 # Name "wxjpeg - Win32 DLL wxUniv Release Ansi"
-# Name "wxjpeg - Win32 Static Native Release Ansi"
+# Name "wxjpeg - Win32 LIB Native Debug Unicode"
 # Name "wxjpeg - Win32 DLL wxUniv Debug Ansi"
+# Name "wxjpeg - Win32 LIB Native Debug Ansi"
 # Name "wxjpeg - Win32 DLL Native Release Unicode"
-# Name "wxjpeg - Win32 Static wxUniv Release Unicode"
-# Name "wxjpeg - Win32 DLL wxUniv Release Unicode"
-# Name "wxjpeg - Win32 Static wxUniv Debug Ansi"
-# Name "wxjpeg - Win32 Static Native Debug Unicode"
-# Name "wxjpeg - Win32 Static wxUniv Release Ansi"
+# Name "wxjpeg - Win32 LIB wxUniv Release Ansi"
+# Name "wxjpeg - Win32 LIB Native Release Unicode"
+# Name "wxjpeg - Win32 LIB wxUniv Debug Ansi"
+# Name "wxjpeg - Win32 DLL Native Debug Unicode"
 # Name "wxjpeg - Win32 DLL Native Debug Ansi"
-# Name "wxjpeg - Win32 Static wxUniv Debug Unicode"
-# Name "wxjpeg - Win32 Static Native Debug Ansi"
+# Name "wxjpeg - Win32 LIB Native Release Ansi"
+# Name "wxjpeg - Win32 LIB wxUniv Release Unicode"
 # Begin Group "Source Files"
 
 # PROP Default_Filter ""