[xiph-cvs] cvs commit: w3d/win32 tarkin.dsw tarkin_lib.dsp test_dec.dsp test_enc.dsp
Holger Waechtler
holger at xiph.org
Mon Mar 11 01:24:20 PST 2002
holger 02/03/11 01:24:20
Modified: . info.c mem.h pnm.c pnm.h tarkin.h tarkin_dec.c
tarkin_enc.c wavelet.h wavelet_coeff.c
wavelet_xform.c yuv.h
Added: . w3dtypes.h
win32 tarkin.dsw tarkin_lib.dsp test_dec.dsp test_enc.dsp
Log:
applied win32 related patches and project files contributed
by Kondoros Attila <cookieman_k at yahoo.com>
Revision Changes Path
1.3 +2 -1 w3d/info.c
Index: info.c
===================================================================
RCS file: /usr/local/cvsroot/w3d/info.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- info.c 2001/11/10 04:12:51 1.2
+++ info.c 2002/03/11 09:24:17 1.3
@@ -11,13 +11,14 @@
********************************************************************
function: maintain the info structure, info <-> header packets
- last mod: $Id: info.c,v 1.2 2001/11/10 04:12:51 giles Exp $
+ last mod: $Id: info.c,v 1.3 2002/03/11 09:24:17 holger Exp $
********************************************************************/
/* general handling of the header and the TarkinInfo structure (and
substructures) */
+#include <malloc.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
<p><p>1.2 +0 -1 w3d/mem.h
Index: mem.h
===================================================================
RCS file: /usr/local/cvsroot/w3d/mem.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mem.h 2001/07/09 06:03:09 1.1
+++ mem.h 2002/03/11 09:24:17 1.2
@@ -1,7 +1,6 @@
#ifndef __MEM_H
#define __MEM_H
-#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
<p><p>1.4 +6 -5 w3d/pnm.c
Index: pnm.c
===================================================================
RCS file: /usr/local/cvsroot/w3d/pnm.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pnm.c 2001/09/07 10:56:30 1.3
+++ pnm.c 2002/03/11 09:24:17 1.4
@@ -3,9 +3,10 @@
* CR/LF safe !
*/
-#include <unistd.h>
#include <string.h>
#include <ctype.h>
+
+#include "w3dtypes.h"
#include "mem.h"
@@ -80,7 +81,7 @@
int read_pnm_header (char *fname, int *w, int *h)
{
int type;
- FILE *fp = fopen(fname, "r");
+ FILE *fp = fopen(fname, "rb");
if (!fp)
return -1;
@@ -95,7 +96,7 @@
int read_pnm (char *fname, uint8_t *buf)
{
- FILE *fp = fopen(fname, "r");
+ FILE *fp = fopen(fname, "rb");
int type;
int w, h;
@@ -127,7 +128,7 @@
{
FILE *outfile;
- outfile = fopen (fname, "w");
+ outfile = fopen (fname, "wb");
if (!outfile) {
fprintf (stderr, "error opening '%s' for writing !!!\n", fname);
@@ -164,7 +165,7 @@
int i;
FILE *outfile;
- outfile = fopen (fname, "w");
+ outfile = fopen (fname, "wb");
if (!outfile) {
printf ("error opening '%s' for writing !!!\n", fname);
<p><p>1.3 +1 -0 w3d/pnm.h
Index: pnm.h
===================================================================
RCS file: /usr/local/cvsroot/w3d/pnm.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pnm.h 2001/09/07 10:56:30 1.2
+++ pnm.h 2002/03/11 09:24:17 1.3
@@ -1,6 +1,7 @@
#ifndef __PPM_H
#define __PPM_H
+#include "w3dtypes.h"
/**
* Returns number of color channels (1 == grayscale, 3 == rgb)
<p><p>1.10 +2 -2 w3d/tarkin.h
Index: tarkin.h
===================================================================
RCS file: /usr/local/cvsroot/w3d/tarkin.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tarkin.h 2001/11/10 04:12:52 1.9
+++ tarkin.h 2002/03/11 09:24:17 1.10
@@ -6,13 +6,13 @@
#include <ogg/ogg.h>
-#define BUG(x...) \
+/*#define BUG(x...) \
do { \
printf("BUG in %s (%s: line %i): ", __FUNCTION__, __FILE__, __LINE__); \
printf(#x); \
printf("\n"); \
exit (-1); \
- } while (0);
+ } while (0);*/
/* Theses determine what infos the packet comes with */
<p><p>1.7 +2 -3 w3d/tarkin_dec.c
Index: tarkin_dec.c
===================================================================
RCS file: /usr/local/cvsroot/w3d/tarkin_dec.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tarkin_dec.c 2001/11/20 11:48:59 1.6
+++ tarkin_dec.c 2002/03/11 09:24:17 1.7
@@ -1,8 +1,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <unistd.h>
-#include <stdint.h>
+#include "w3dtypes.h"
#include "mem.h"
#include "tarkin.h"
#include "pnm.h"
@@ -39,7 +38,7 @@
exit (-1);
}
- if ((fd = open (fname, O_RDONLY)) < 0) {
+ if ((fd = open (fname, O_RDONLY|O_BINARY)) < 0) {
printf ("error opening '%s'\n", fname);
exit (-1);
}
<p><p>1.14 +3 -3 w3d/tarkin_enc.c
Index: tarkin_enc.c
===================================================================
RCS file: /usr/local/cvsroot/w3d/tarkin_enc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tarkin_enc.c 2001/11/07 21:19:03 1.13
+++ tarkin_enc.c 2002/03/11 09:24:17 1.14
@@ -1,11 +1,11 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <unistd.h>
-#include <stdint.h>
+
#include "mem.h"
#include "tarkin.h"
#include "pnm.h"
+#include "w3dtypes.h"
static
@@ -94,7 +94,7 @@
layer[0].format = (type == 3) ? TARKIN_RGB24 : TARKIN_GRAYSCALE;
- if ((te.fd = open ("stream.ogg", O_CREAT | O_RDWR | O_TRUNC, 0644)) < 0) {
+ if ((te.fd = open ("stream.ogg", O_CREAT | O_RDWR | O_TRUNC | O_BINARY, 0644)) < 0) {
printf ("error opening '%s' for writing !\n", "stream.ogg");
usage (argv[0]);
}
<p><p>1.6 +2 -2 w3d/wavelet.h
Index: wavelet.h
===================================================================
RCS file: /usr/local/cvsroot/w3d/wavelet.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wavelet.h 2001/09/07 10:56:30 1.5
+++ wavelet.h 2002/03/11 09:24:17 1.6
@@ -1,7 +1,7 @@
#ifndef __WAVELET_H
#define __WAVELET_H
-#include <stdint.h>
+#include "w3dtypes.h"
typedef struct {
@@ -49,7 +49,7 @@
Wavelet3DBuf* buf,
int16_t offset);
#else
-#define wavelet_3d_buf_dump(x...)
+#define wavelet_3d_buf_dump(fmt,f,id,buf,offset)
#endif
#endif
<p><p>1.9 +1 -0 w3d/wavelet_coeff.c
Index: wavelet_coeff.c
===================================================================
RCS file: /usr/local/cvsroot/w3d/wavelet_coeff.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wavelet_coeff.c 2001/11/20 16:22:04 1.8
+++ wavelet_coeff.c 2002/03/11 09:24:17 1.9
@@ -1,6 +1,7 @@
#include "mem.h"
#include "wavelet.h"
#include "rle.h"
+#include "w3dtypes.h"
#define GRAY_CODES 1
<p><p>1.6 +1 -1 w3d/wavelet_xform.c
Index: wavelet_xform.c
===================================================================
RCS file: /usr/local/cvsroot/w3d/wavelet_xform.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wavelet_xform.c 2001/11/20 11:15:00 1.5
+++ wavelet_xform.c 2002/03/11 09:24:17 1.6
@@ -1,7 +1,7 @@
#include "mem.h"
#include <assert.h>
#include "wavelet.h"
-
+#include "w3dtypes.h"
static
<p><p>1.5 +1 -1 w3d/yuv.h
Index: yuv.h
===================================================================
RCS file: /usr/local/cvsroot/w3d/yuv.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- yuv.h 2001/06/29 09:19:25 1.4
+++ yuv.h 2002/03/11 09:24:17 1.5
@@ -2,8 +2,8 @@
#ifndef __YUV_H
#define __YUV_H
-#include <stdint.h>
#include "wavelet.h"
+#include "w3dtypes.h"
extern void rgb24_to_yuv (uint8_t *rgb, Wavelet3DBuf *yuv [], uint32_t frame);
extern void yuv_to_rgb24 (Wavelet3DBuf *yuv [], uint8_t *rgb, uint32_t frame);
<p><p>1.1 w3d/w3dtypes.h
Index: w3dtypes.h
===================================================================
#ifndef __TYPES_HEADER_INLUDE__
#define __TYPES_HEADER_INLUDE__
#if !defined(_WIN32) // These headers do not exists in VC6 either in BC5
#include <unistd.h>
#include <stdint.h>
#define O_BINARY 0
#else
#define TYPE_BITS 10
#define __FUNCTION__ "" // in Win this is not supported.
typedef char int8_t;
typedef short int16_t;
typedef int int32_t;
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
typedef unsigned int uint32_t;
typedef int16_t TYPE;
#define snprintf _snprintf // name confusion...
#define inline __inline
#endif
#endif // __TYPES_HEADER_INLUDE__
<p><p>1.1 w3d/win32/tarkin.dsw
Index: tarkin.dsw
===================================================================
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "tarkin_lib"=.\tarkin_lib.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "test_dec"=.\test_dec.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name tarkin_lib
End Project Dependency
}}}
###############################################################################
Project: "test_enc"=.\test_enc.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name tarkin_lib
End Project Dependency
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################
<p><p>1.1 w3d/win32/tarkin_lib.dsp
Index: tarkin_lib.dsp
===================================================================
# Microsoft Developer Studio Project File - Name="tarkin_lib" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=tarkin_lib - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "tarkin_lib.mak".
!MESSAGE
!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 "tarkin_lib.mak" CFG="tarkin_lib - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "tarkin_lib - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "tarkin_lib - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "tarkin_lib - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /G5 /W3 /O2 /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "RLECODER" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "tarkin_lib - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /G5 /W3 /ZI /Od /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /D "DBG_XFORM" /D "RLECODER" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "tarkin_lib - Win32 Release"
# Name "tarkin_lib - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\..\ogg\src\bitwise.c
# End Source File
# Begin Source File
SOURCE=..\..\ogg\src\framing.c
# End Source File
# Begin Source File
SOURCE=..\info.c
# End Source File
# Begin Source File
SOURCE=..\mem.c
# End Source File
# Begin Source File
SOURCE=..\pnm.c
# End Source File
# Begin Source File
SOURCE=..\tarkin.c
# End Source File
# Begin Source File
SOURCE=..\wavelet.c
# End Source File
# Begin Source File
SOURCE=..\wavelet_coeff.c
# End Source File
# Begin Source File
SOURCE=..\wavelet_xform.c
# End Source File
# Begin Source File
SOURCE=..\yuv.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=..\bitcoder.h
# End Source File
# Begin Source File
SOURCE=..\golomb.h
# End Source File
# Begin Source File
SOURCE=..\mem.h
# End Source File
# Begin Source File
SOURCE=..\..\ogg\include\ogg\ogg.h
# End Source File
# Begin Source File
SOURCE=..\..\ogg\include\ogg\os_types.h
# End Source File
# Begin Source File
SOURCE=..\pnm.h
# End Source File
# Begin Source File
SOURCE=..\rle.h
# End Source File
# Begin Source File
SOURCE=..\tarkin.h
# End Source File
# Begin Source File
SOURCE=..\w3dtypes.h
# End Source File
# Begin Source File
SOURCE=..\wavelet.h
# End Source File
# Begin Source File
SOURCE=..\yuv.h
# End Source File
# End Group
# End Target
# End Project
<p><p>1.1 w3d/win32/test_dec.dsp
Index: test_dec.dsp
===================================================================
# Microsoft Developer Studio Project File - Name="test_dec" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=test_dec - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "test_dec.mak".
!MESSAGE
!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 "test_dec.mak" CFG="test_dec - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "test_dec - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "test_dec - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "test_dec - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /G5 /W3 /O2 /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 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 /subsystem:console /machine:I386
# 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 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 /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "test_dec - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /G5 /W3 /ZI /Od /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DBG_XFORM" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 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 /subsystem:console /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 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 /subsystem:console /incremental:no /map /debug /machine:I386
!ENDIF
# Begin Target
# Name "test_dec - Win32 Release"
# Name "test_dec - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\tarkin_dec.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project
<p><p>1.1 w3d/win32/test_enc.dsp
Index: test_enc.dsp
===================================================================
# Microsoft Developer Studio Project File - Name="test_enc" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=test_enc - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "test_enc.mak".
!MESSAGE
!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 "test_enc.mak" CFG="test_enc - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "test_enc - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "test_enc - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "test_enc - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /G5 /W3 /O2 /I "..\..\ogg\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 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 /subsystem:console /machine:I386
# 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 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 /subsystem:console /machine:I386
!ELSEIF "$(CFG)" == "test_enc - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /G5 /W3 /Gm /ZI /Od /I "..\..\ogg\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DBG_XFORM" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 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 /subsystem:console /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 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 /subsystem:console /incremental:no /map /debug /machine:I386
!ENDIF
# Begin Target
# Name "test_enc - Win32 Release"
# Name "test_enc - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\tarkin_enc.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project
<p><p><p>--- >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.
More information about the commits
mailing list