[xiph-cvs] cvs commit: win32sdk/sdk/build README.examples mkmak.bat build_all.bat examples.opt
Chris Wolf
cwolf at xiph.org
Thu Sep 13 20:16:15 PDT 2001
cwolf 01/09/13 20:16:15
Modified: . all.opt build_all.bat makesdk.bat mfmacro.bat
sdk/build build_all.bat examples.opt
Added: . README.win32sdk mkmak.bat
sdk/build README.examples mkmak.bat
Log:
Add some readme files, break out the makefile generation scripts.
Revision Changes Path
1.3 +1212 -210 win32sdk/all.opt
Index: all.opt
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/all.opt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
Binary files /tmp/cvsGmRLmf and /tmp/cvs6L0vWq differ
1.4 +1 -8 win32sdk/build_all.bat
Index: build_all.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/build_all.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build_all.bat 2001/09/14 01:26:30 1.3
+++ build_all.bat 2001/09/14 03:16:13 1.4
@@ -1,5 +1,5 @@
@echo off
-rem $Id: build_all.bat,v 1.3 2001/09/14 01:26:30 cwolf Exp $
+rem $Id: build_all.bat,v 1.4 2001/09/14 03:16:13 cwolf Exp $
rem
rem Invoke as "build_all.bat CLEAN" to clean all targets
rem
@@ -7,13 +7,6 @@
if not exist %SRCROOT%\ogg\include\ogg\ogg.h goto noogg
if not exist %SRCROOT%\vorbis\include\vorbis\codec.h goto novorbis
-
-rem If one of the makefiles doesn't exist,
-rem assume they all need to be generated
-rem
-if not exist %SRCROOT%\vorbis\win32\vorbis_dynamic.mak (
- msdev -ex ExportMakefile
-)
cd "..\ogg\win32"
nmake /nologo /F .\ogg_dynamic.mak CFG="ogg_dynamic - Win32 Debug" %1
1.6 +8 -4 win32sdk/makesdk.bat
Index: makesdk.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/makesdk.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- makesdk.bat 2001/09/14 01:26:30 1.5
+++ makesdk.bat 2001/09/14 03:16:13 1.6
@@ -1,13 +1,17 @@
-rem @echo off
+ at echo off
echo ---+++--- Making Win32 SDK ---+++---
rem
-rem $Id: makesdk.bat,v 1.5 2001/09/14 01:26:30 cwolf Exp $
+rem $Id: makesdk.bat,v 1.6 2001/09/14 03:16:13 cwolf Exp $
rem
if ."%SRCROOT%"==."" goto notset
if ."%MSDEVDIR%"==."" goto msdevnotset
+rem Create and install MSVC macros, if needed
+call mfmacro.bat
+if errorlevel 1 goto ERROR
+
rem If one of the makefiles doesn't exist,
rem assume they all need to be generated
rem
@@ -87,7 +91,7 @@
echo Copying examples...
-xcopy /y %SRCROOT%\vorbis\examples\*.c %SRCROOT%\win32sdk\sdk\examples\vorbis
+xcopy /y %SRCROOT%\vorbis\examples\*.c %SRCROOT%\win32sdk\sdk\examples\vorbis > nul
echo ... copied.
@@ -122,7 +126,7 @@
if errorlevel 1 goto ERROR
xcopy %SRCROOT%\vorbis\win32\Vorbis_Dynamic_Debug\vorbis_d.pdb %SRCROOT%\win32sdk\sdk\lib > nul
if errorlevel 1 goto ERROR
-xcopy %SRCROOT%\vorbis\win32\Vorbis_Dynamic_Debug\vorbis_d.dll %SRCROOT%\win32sdk\sdk\bin
+xcopy %SRCROOT%\vorbis\win32\Vorbis_Dynamic_Debug\vorbis_d.dll %SRCROOT%\win32sdk\sdk\bin > nul
if errorlevel 1 goto ERROR
xcopy %SRCROOT%\vorbis\win32\VorbisFile_Static_Release\vorbisfile_static.lib %SRCROOT%\win32sdk\sdk\lib > nul
if errorlevel 1 goto ERROR
1.3 +6 -3 win32sdk/mfmacro.bat
Index: mfmacro.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/mfmacro.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mfmacro.bat 2001/09/14 01:26:30 1.2
+++ mfmacro.bat 2001/09/14 03:16:13 1.3
@@ -1,10 +1,13 @@
-rem @echo off
-rem $Id: mfmacro.bat,v 1.2 2001/09/14 01:26:30 cwolf Exp $
+ at echo off
+rem $Id: mfmacro.bat,v 1.3 2001/09/14 03:16:13 cwolf Exp $
rem Creates and installs VC macro for exporting makefiles from
rem the command line.
rem
-rem To invoke this macro: msdev -ex ExportMakefile
+rem To invoke the macro for exporting makefiles for the libraries:
+rem msdev -ex ExportMakefile
rem
+rem To invloke the macro for exporting makfiles for the samples:
+rem msdev -ex ExportExampleMakefiles
rem
if .%SRCROOT%==. goto notset
set macrofile="%msdevdir%\Macros\oggvorbis.dsm"
1.1 win32sdk/README.win32sdk
Index: README.win32sdk
===================================================================
$Id: README.win32sdk,v 1.1 2001/09/14 03:16:13 cwolf Exp $
$Name: $
win32sdk Readme, 13 September, 2001 Chris Wolf
===========================================================================
This is the win32 SDK for Ogg/Vorbis
This directory, "win32sdk", is not actually part of the SDK as such,
but is a staging area for building the SDK. The complete SDK ends
up in a directory tree rooted in "sdk", under this directory.
The "sdk" directory tree, once prepared should then be relocatable
and usable by itself.
PREREQUSITES
The SRCROOT environment variable must be set pointing to the
root directory where each of the cvs modules are rooted. The
cvs modules "ogg", "vorbis" and "win32sdk" (this module) are
required for this build.
The script "mkmak.bat" must be run at least once to generate
the makefiles.
It will:
1.) create and install MSVC macros which allow performing an
export of project makefiles and associated depenency files.
The macro will then be invoked to generate the makefiles.
BUILDING
To prepare the sdk for use, run "mkmak.bat", followed by "makesdk.bat".
This script will:
1.) create "include", "lib", "bin", "doc" and "examples"
directories and copy the required files from the cvs modules.
2.) Using nmake, build the static and dynamic (DLL) libraries
and copy them to the sdk\lib directory.
Note that the makefiles are generated from the IDE, and are thus a
reflection of the workspace and project file states. It is strongly
recommended to make changes via the IDE and export the makefiles,
rather than tweaking the makefiles directly.
IDE build:
Load the "all.dsw" workspace. This workspace loads and manages the
the dependent project files. To perform a build, from the "build"
menu, select the "build" menu item. This will build all the dependent
libaries, but not copy them.
The command line script, "build_all.bat" can also be invoked for
this purpose.
INSTALLING
Once prepared, the tree rooted in "sdk" can be used to build
win32 applications based on Ogg/Vorbis. See the README in
sdk\examples for further information.
1.1 win32sdk/mkmak.bat
Index: mkmak.bat
===================================================================
@echo off
rem $Id: mkmak.bat,v 1.1 2001/09/14 03:16:13 cwolf Exp $
rem
rem This can't be called from the build script because
rem it runs asychronously.
rem
if ."%SRCROOT"==."" goto notset
rem Create and install MSVC macros, if needed
call mfmacro.bat
if errorlevel 1 goto error
rem If one of the makefiles doesn't exist,
rem assume they all need to be generated
rem
if not exist %SRCROOT%\vorbis\win32\vorbis_dynamic.mak (
msdev -ex ExportMakefile
)
goto done
:error
echo **** Error: couldn't create or install macro
goto done
:notset
echo **** Error: must set SRCROOT
goto done
:done
1.2 +2 -8 win32sdk/sdk/build/build_all.bat
Index: build_all.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/build_all.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build_all.bat 2001/09/14 01:53:24 1.1
+++ build_all.bat 2001/09/14 03:16:14 1.2
@@ -1,5 +1,5 @@
@echo off
-rem $Id: build_all.bat,v 1.1 2001/09/14 01:53:24 cwolf Exp $
+rem $Id: build_all.bat,v 1.2 2001/09/14 03:16:14 cwolf Exp $
rem
rem Invoke as "build_all.bat CLEAN" to clean all targets
rem
@@ -7,14 +7,8 @@
if not exist %SDKHOME%\lib\ogg.lib goto nolib
-rem If one of the makefiles doesn't exist,
-rem assume they all need to be generated
-rem
-if not exist %SDKHOME%\build\examples.mak (
- msdev -ex ExportExampleMakefiles
-)
-
nmake /nologo /f encoder.mak CFG="encoder - Win32 Debug" %1
+exit
nmake /nologo /f encoder.mak CFG="encoder - Win32 Release" %1
nmake /nologo /f encoder_static.mak CFG="encoder_static - Win32 Debug" %1
nmake /nologo /f encoder_static.mak CFG="encoder_static - Win32 Release" %1
1.2 +19 -38 win32sdk/sdk/build/examples.opt
Index: examples.opt
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/examples.opt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
Binary files /tmp/cvsrP2SSD and /tmp/cvsEoD7Vb differ
1.1 win32sdk/sdk/build/README.examples
Index: README.examples
===================================================================
$Id: README.examples,v 1.1 2001/09/14 03:16:14 cwolf Exp $
$Name: $
=======================================================================
The SDKHOME directory must be set to where the SDK is rooted,
including the "sdk" part of the path.
e.g. "c:\src\xiph\sdk"
The sample programs in "SDKHOME\examples\vorbis"
can be built by using this build environment.
For an IDE build, the workspace "examples.dsw" can be loaded,
then from the "build" menu, the "build" menu item will build
all the example programs, both static and dynamic, debug and
release versions.
For a command line build, first run "mkmak.bat" to generate
the makefiles, them run "build_all.bat"
"clean_all.bat" will run all the clean targets.
1.1 win32sdk/sdk/build/mkmak.bat
Index: mkmak.bat
===================================================================
@echo off
rem $Id: mkmak.bat,v 1.1 2001/09/14 03:16:14 cwolf Exp $
rem
rem This can't be called from the build script because
rem it runs asychronously.
rem
if ."%SDKHOME%"==."" goto notset
rem If one of the makefiles doesn't exist,
rem assume they all need to be generated
rem
if not exist %SDKHOME%\build\examples.mak (
msdev -ex ExportExampleMakefiles
)
goto done
:notset
echo **** Error: must set SDKHOME
goto done
:done
--- >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