Make wxMMedia2 compile on VC++ 5

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index a7ee45318724204a994bd1f8b21a37033644d0a2..601688d4175e9c578c941b2f9255a75a9449d16b 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,6 +8,7 @@
 #
 !include <ntwin32.mak>
 
+WXVERSION=21b8
 WIN95=1
 
 !if "$(WIN95)" == "0"
@@ -29,8 +30,11 @@ CPU=i386
 OBJSUFF=obj
 SRCSUFF=cpp
 
+WAITFLAG=/w
+
 # If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally
-WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
+#WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
+WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
 #WINLINKFLAGS=/NODEFAULTLIB /INCREMENTAL:NO /NOLOGO -align:0x1000 -machine:$(CPU) -subsystem:windows,$(APPVER)
 WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
 #WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib libc.lib oldnames.lib\
@@ -52,9 +56,9 @@ WXBASESRC=$(WXDIR)\src\common
 #--------------------------------------------------------------------
 # Normal application    -            -           -            wx.lib
 #
-# wxWin as DLL          Defined      -           Defined      wx200.lib
+# wxWin as DLL          Defined      -           Defined      wx$(WXVERSION).lib
 #
-# App using wxWin DLL   -            Defined     -            wx200.lib
+# App using wxWin DLL   -            Defined     -            wx$(WXVERSION).lib
 #
 # App built as one DLL  Defined      -           -            wx.lib
 #
@@ -109,19 +113,24 @@ NOPCH=0
 
 # This sets 'D' to a suitable directory name
 # for this kind of build, and WXLIBNAME to one of wx (static release), wx_d (static debug),
-# wx200 (DLL release), wx200_d (DLL debug)
+# wx$(WXVERSION) (DLL release), wx$(WXVERSION)_d (DLL debug)
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
-WXLIBNAME=wx200
+WXLIBNAME=wx$(WXVERSION)
 !else
 WXLIBNAME=wx
 !endif
 
+!if "$(NEW_WXLIBNAME)" != ""
+WXLIBNAME=$(NEW_WXLIBNAME)
+!endif
+
 !if "$(FINAL)" == "1"
 D=Release
 !else
 D=Debug
-WXLIBNAME=$(WXLIBNAME)_d
+LIBEXT=_d
+WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
 !endif
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
@@ -130,8 +139,8 @@ D=$(D)DLL
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
-INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC)
-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib
+INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg $(EXTRAINC)
+LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\xpm.lib
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 OPTIONS=
@@ -187,3 +196,13 @@ LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll #
 
 DUMMYOBJ=$(WXDIR)\src\msw\$D\$(DUMMY).obj
 
+.c.obj:
+       cl @<<
+$(CPPFLAGS2) /Fo$@ /c $<
+<<
+
+.cpp.obj:
+       cl @<<
+$(CPPFLAGS2) /Fo$@ /c $<
+<<
+