[xiph-cvs] cvs commit: vorbis/win32 vorbis.def vorbis_dynamic.dsp vorbisenc.def vorbisenc_dynamic.dsp

Fri Sep 7 02:42:02 PDT 2001

cwolf       01/09/07 02:42:02

  Modified:    win32    vorbis.def vorbis_dynamic.dsp vorbisenc.def
                        vorbisenc_dynamic.dsp
  Log:
  Eliminate redundant preprocessor defines, don't name library in module definitions.

Revision  Changes    Path
1.4       +4 -2      vorbis/win32/vorbis.def

Index: vorbis.def
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbis.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4

--- vorbis.def	2001/06/18 15:03:44	1.3
+++ vorbis.def	2001/09/07 09:42:01	1.4
@@ -1,5 +1,7 @@
-; vorbis.def
-LIBRARY vorbis
+; 
+; $Id: vorbis.def,v 1.4 2001/09/07 09:42:01 cwolf Exp $
+;
+LIBRARY
 EXPORTS
 vorbis_info_init
 vorbis_info_clear

1.7       +22 -3     vorbis/win32/vorbis_dynamic.dsp

Index: vorbis_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbis_dynamic.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vorbis_dynamic.dsp	2001/08/12 20:00:32	1.6
+++ vorbis_dynamic.dsp	2001/09/07 09:42:01	1.7
@@ -43,7 +43,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DLL" /D "STANDALONE_VORBISENC_DLL" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,8 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBIS_DLL" /D "STANDALONE_VORBISENC_DLL" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +80,8 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg_d.lib /nologo /dll /debug /machine:I386 /out:"Vorbis_Dynamic_Debug/vorbis_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg_d.lib /nologo /dll /debug /machine:I386 /def:".\vorbis.def" /out:"Vorbis_Dynamic_Debug/vorbis_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug"
+# SUBTRACT LINK32 /verbose /pdb:none
 
 !ENDIF 
 
@@ -108,6 +110,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\lib\dllmain.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\lib\envelope.c
 # End Source File
 # Begin Source File
@@ -248,6 +254,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\lib\shmmap.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\lib\smallft.h
 # End Source File
 # Begin Source File
@@ -265,6 +275,15 @@
 # Begin Source File
 
 SOURCE=.\vorbis.def
+
+!IF  "$(CFG)" == "vorbis_dynamic - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "vorbis_dynamic - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # End Group
 # End Target

1.2       +5 -2      vorbis/win32/vorbisenc.def

Index: vorbisenc.def
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisenc.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vorbisenc.def	2000/11/06 09:48:26	1.1
+++ vorbisenc.def	2001/09/07 09:42:01	1.2
@@ -1,5 +1,8 @@
-; vorbisenc.def
-LIBRARY vorbisenc
+;
+; $Id: vorbisenc.def,v 1.2 2001/09/07 09:42:01 cwolf Exp $
+;
+LIBRARY
+
 EXPORTS
 vorbis_encode_init
 vorbis_encode_ctl

1.6       +26 -3     vorbis/win32/vorbisenc_dynamic.dsp

Index: vorbisenc_dynamic.dsp
===================================================================
RCS file: /usr/local/cvsroot/vorbis/win32/vorbisenc_dynamic.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vorbisenc_dynamic.dsp	2001/08/12 20:00:32	1.5
+++ vorbisenc_dynamic.dsp	2001/09/07 09:42:01	1.6
@@ -43,7 +43,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STANDALONE_VORBISENC_DLL" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,8 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "VORBISENC_DYNAMIC_EXPORTS" /D "_WIN32" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\ogg\include" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "STANDALONE_VORBISENC_DLL" /FR /FD /GZ /c
+# SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +80,8 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg_d.lib vorbis_d.lib /nologo /dll /debug /machine:I386 /out:"VorbisEnc_Dynamic_Debug/vorbisenc_d.dll" /pdbtype:sept /libpath:"..\..\ogg\win32\Dynamic_Debug" /libpath:".\Vorbis_Dynamic_Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\vorbisenc.def" /out:"VorbisEnc_Dynamic_Debug/vorbisenc_d.dll" /pdbtype:sept /libpath:"../../vorbis/win32/Vorbis_Dynamic_Debug"
+# SUBTRACT LINK32 /verbose /pdb:none
 
 !ENDIF 
 
@@ -92,12 +94,24 @@
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=..\lib\dllmain.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\lib\vorbisenc.c
 # End Source File
 # End Group
 # Begin Group "Header Files"
 
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\lib\shmmap_c.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\vorbis\vorbisenc.h
+# End Source File
 # End Group
 # Begin Group "Resource Files"
 
@@ -109,6 +123,15 @@
 # Begin Source File
 
 SOURCE=.\vorbisenc.def
+
+!IF  "$(CFG)" == "vorbisenc_dynamic - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "vorbisenc_dynamic - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # End Group
 # End Target

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.

