From c152d1adf910409bff06b9651247584d9e606c95 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 18 Mar 2013 06:22:51 +1100 Subject: [PATCH 1/1] More Microsoft Visual Studio project file updates. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch from Janne Hyvärinen . --- README | 38 +++++++++------------- .../c/decode/file/example_c_decode_file.vcproj | 4 +-- .../c/encode/file/example_c_encode_file.vcproj | 4 +-- .../cpp/decode/file/example_cpp_decode_file.vcproj | 4 +-- .../cpp/encode/file/example_cpp_encode_file.vcproj | 4 +-- src/flac/flac.vcproj | 4 +-- src/flac/iffscan.vcproj | 4 +-- src/libFLAC/libFLAC_dynamic.vcproj | 26 +++++++-------- src/libFLAC/libFLAC_static.vcproj | 20 ++++++------ src/metaflac/metaflac.vcproj | 4 +-- src/test_libFLAC++/test_libFLAC++.vcproj | 4 +-- src/test_libFLAC/test_libFLAC.vcproj | 4 +-- src/test_seeking/test_seeking.vcproj | 4 +-- src/utils/flacdiff/flacdiff.vcproj | 4 +-- 14 files changed, 60 insertions(+), 68 deletions(-) diff --git a/README b/README index df28e75..41ba136 100644 --- a/README +++ b/README @@ -204,49 +204,41 @@ not an x86, change -DFLAC__CPU_IA32 to -DFLAC__CPU_UNKNOWN. Building with MSVC =============================================================================== -There are .dsp projects and a master FLAC.dsw workspace to build all -the libraries and executables with MSVC6. There are also .vcproj -projects and a master FLAC.sln solution to build all the libraries and -executables with VC++ 2005. +There are .vcproj projects and a master FLAC.sln solution to build all +the libraries and executables with MSVC 2005 or newer. Prerequisite: you must have the Ogg libraries installed as described later. -Prerequisite: you must have nasm installed, and nasmw.exe must be in -your PATH, or the path to nasmw.exe must be added to the list of +Prerequisite: you must have nasm installed, and nasm.exe must be in +your PATH, or the path to nasm.exe must be added to the list of directories for executable files in the MSVC global options. -MSVC6: -To build everything, run Developer Studio, do File|Open Workspace, -and open FLAC.dsw. Select "Build | Set active configuration..." -from the menu, then in the dialog, select "All - Win32 Release" (or -Debug if you prefer). Click "Ok" then hit F7 to build. - VC++ 2005: To build everything, run Visual Studio, do File|Open and open FLAC.sln. From the dropdown in the toolbar, select "Release" instead of "Debug", then hit F7 to build. -Either way, this will build all libraries both statically (e.g. +This will build all libraries both statically (e.g. objs\release\lib\libFLAC_static.lib) and as DLLs (e.g. objs\release\lib\libFLAC.dll), and it will build all binaries, statically linked (e.g. objs\release\bin\flac.exe). -Everything will end up in the "obj" directory. DLLs and .exe files +Everything will end up in the "objs" directory. DLLs and .exe files are all that are needed and can be copied to an installation area and -added to the PATH. The plugins have to be copied to their appropriate -place in the player area. +added to the PATH. -By default the code is configured with Ogg support. Before building FLAC +By default the code is configured with Ogg support. Before building FLAC you will need to get the Ogg source distribution -(see http://xiph.org/ogg/vorbis/download/), build ogg_static.lib (load and -build win32\ogg_static.dsp), copy ogg_static.lib into FLAC's -'objs\release\lib' directory, and copy the entire include\ogg tree into -FLAC's 'include' directory (so that there is an 'ogg' directory in FLAC's +(see http://xiph.org/downloads/), build libogg_static.lib (load +win32\libogg_static.sln, change solution configuration to "Release" and +code generation to "Multi-threaded (/MT)", then build), copy libogg_static.lib +into FLAC's 'objs\release\lib' directory, and copy the entire include\ogg tree +into FLAC's 'include' directory (so that there is an 'ogg' directory in FLAC's 'include' directory with the files ogg.h, os_types.h and config_types.h). -If you want to build without Ogg support, instead edit all .dsp or -.vcproj files and remove any occurrences of "/D FLAC__HAS_OGG". +If you want to build without Ogg support, instead edit all .vcproj files +and remove any "FLAC__HAS_OGG" definitions. =============================================================================== diff --git a/examples/c/decode/file/example_c_decode_file.vcproj b/examples/c/decode/file/example_c_decode_file.vcproj index 18482f4..2498c81 100644 --- a/examples/c/decode/file/example_c_decode_file.vcproj +++ b/examples/c/decode/file/example_c_decode_file.vcproj @@ -62,7 +62,7 @@ /> @@ -422,7 +422,7 @@ > @@ -440,7 +440,7 @@ > @@ -450,7 +450,7 @@ > @@ -464,7 +464,7 @@ > @@ -474,7 +474,7 @@ > @@ -488,7 +488,7 @@ > @@ -498,7 +498,7 @@ > @@ -512,7 +512,7 @@ > @@ -522,7 +522,7 @@ > diff --git a/src/libFLAC/libFLAC_static.vcproj b/src/libFLAC/libFLAC_static.vcproj index 5c28efd..3f9a8de 100644 --- a/src/libFLAC/libFLAC_static.vcproj +++ b/src/libFLAC/libFLAC_static.vcproj @@ -387,7 +387,7 @@ > @@ -397,7 +397,7 @@ > @@ -411,7 +411,7 @@ > @@ -421,7 +421,7 @@ > @@ -435,7 +435,7 @@ > @@ -445,7 +445,7 @@ > @@ -459,7 +459,7 @@ > @@ -469,7 +469,7 @@ > @@ -483,7 +483,7 @@ > @@ -493,7 +493,7 @@ > diff --git a/src/metaflac/metaflac.vcproj b/src/metaflac/metaflac.vcproj index 7a5d0a5..d6637fe 100644 --- a/src/metaflac/metaflac.vcproj +++ b/src/metaflac/metaflac.vcproj @@ -62,7 +62,7 @@ />