diff options
27 files changed, 18 insertions, 72 deletions
diff --git a/Makefile.am b/Makefile.am index c8018b28..bc456238 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,6 @@ EXTRA_DIST = \ COPYING.LGPL \ FLAC.dsw \ Makefile.lite \ - Makefile.vc \ all.dsp \ all_dynamic.dsp \ all_static.dsp \ @@ -151,52 +151,26 @@ not an x86, change -DFLAC__CPU_IA32 to -DFLAC__CPU_UNKNOWN. Building with MSVC =============================================================================== -There are two ways to build with MSVC: +There are now .dsp projects and a master FLAC.dsw workspace to build +all the libraries and executables. - 1. Project Files - ---------------- - Prerequisite: you must have the Ogg libraries installed as described - later. +Prerequisite: you must have the Ogg libraries installed as described +later. - Prerequisite: you must have nasm installed, and have the environment - variable FLAC_NASM set to the full path to nasmw.exe, e.g +Prerequisite: you must have nasm installed, and have the environment +variable FLAC_NASM set to the full path to nasmw.exe, e.g - C:\nasm\nasmw.exe +C:\nasm\nasmw.exe - To build everything, run Developer Studio, do File|Open Workspace, - and open FLAC.dsw. Switch to the 'Files' tab, select 'all files' - from the tree, do right-mouse-button and 'Set as active project'. - The default build mode will probably be Debug; to change to release - do Build|Set Active Configuration and select 'all - Win32 Release'. - Then do Project|Build. This will build all libraries both statically - (e.g. obj\debug\lib\libFLAC_static.lib) and as DLLs (e.g. - obj\debug\bin\libFLAC.dll), and it will build all binaries, statically - linked (e.g. obj\debug\bin\flac.exe). +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. This will build +all libraries both statically (e.g. obj\release\lib\libFLAC_static.lib) +and as DLLs (e.g. obj\release\bin\libFLAC.dll), and it will build all +binaries, statically linked (e.g. obj\release\bin\flac.exe). - 2. nmake - -------- - 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. - - To build everything, open a Command window, cd to the top-level - directory (where this README is) and do - - nmake /f Makefile.vc - - This will recur into all the source directories in the right order - and build everything. The libraries will be build only as static - libs. You need only to install the binaries. To clean up everything - you can do - - nmake /f Makefile.vc clean - - from the top level directory, or any directory which has a - Makefile.vc - -Everything will end up in the 'obj' directory. DLLs and .exe files +Everything will end up in the "obj" 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. For Winamp2 this is <winamp2-dir>\Plugins diff --git a/src/Makefile.am b/src/Makefile.am index 74ab4239..34a5786e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,5 +43,4 @@ SUBDIRS = \ test_streams EXTRA_DIST = \ - Makefile.lite \ - Makefile.vc + Makefile.lite diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am index ac4afb0d..9e25601b 100644 --- a/src/flac/Makefile.am +++ b/src/flac/Makefile.am @@ -24,7 +24,6 @@ endif EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ flac.dsp flac_SOURCES = \ diff --git a/src/libFLAC++/Makefile.am b/src/libFLAC++/Makefile.am index 112f4547..1aa2fed9 100644 --- a/src/libFLAC++/Makefile.am +++ b/src/libFLAC++/Makefile.am @@ -24,7 +24,6 @@ m4data_DATA = libFLAC++.m4 EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ libFLAC++_dynamic.dsp \ libFLAC++_static.dsp \ libFLAC++.m4 diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am index 4717598d..29f96b74 100644 --- a/src/libFLAC/Makefile.am +++ b/src/libFLAC/Makefile.am @@ -39,7 +39,6 @@ m4data_DATA = libFLAC.m4 EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ libFLAC_dynamic.dsp \ libFLAC_static.dsp \ libFLAC.m4 diff --git a/src/libOggFLAC++/Makefile.am b/src/libOggFLAC++/Makefile.am index 88237771..55077abb 100644 --- a/src/libOggFLAC++/Makefile.am +++ b/src/libOggFLAC++/Makefile.am @@ -24,7 +24,6 @@ m4data_DATA = libOggFLAC++.m4 EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ libOggFLAC++_dynamic.dsp \ libOggFLAC++_static.dsp \ libOggFLAC++.m4 diff --git a/src/libOggFLAC/Makefile.am b/src/libOggFLAC/Makefile.am index 58c189a4..8e248c68 100644 --- a/src/libOggFLAC/Makefile.am +++ b/src/libOggFLAC/Makefile.am @@ -29,7 +29,6 @@ m4data_DATA = libOggFLAC.m4 EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ libOggFLAC_dynamic.dsp \ libOggFLAC_static.dsp \ libOggFLAC.m4 diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am index 17511c30..872f8371 100644 --- a/src/metaflac/Makefile.am +++ b/src/metaflac/Makefile.am @@ -20,7 +20,6 @@ CFLAGS = @CFLAGS@ EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ metaflac.dsp metaflac_SOURCES = \ diff --git a/src/monkeys_audio_utilities/Makefile.am b/src/monkeys_audio_utilities/Makefile.am index 67e53f71..0c44f293 100644 --- a/src/monkeys_audio_utilities/Makefile.am +++ b/src/monkeys_audio_utilities/Makefile.am @@ -16,6 +16,3 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. SUBDIRS = flac_mac flac_ren - -EXTRA_DIST = \ - Makefile.vc diff --git a/src/monkeys_audio_utilities/flac_mac/Makefile.am b/src/monkeys_audio_utilities/flac_mac/Makefile.am index 98e74c00..95a00fe6 100644 --- a/src/monkeys_audio_utilities/flac_mac/Makefile.am +++ b/src/monkeys_audio_utilities/flac_mac/Makefile.am @@ -16,6 +16,5 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. EXTRA_DIST = \ - Makefile.vc \ flac_mac.dsp \ main.c diff --git a/src/monkeys_audio_utilities/flac_ren/Makefile.am b/src/monkeys_audio_utilities/flac_ren/Makefile.am index 8b9a37dd..eaf60b17 100644 --- a/src/monkeys_audio_utilities/flac_ren/Makefile.am +++ b/src/monkeys_audio_utilities/flac_ren/Makefile.am @@ -16,6 +16,5 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. EXTRA_DIST = \ - Makefile.vc \ flac_ren.dsp \ main.c diff --git a/src/plugin_common/Makefile.am b/src/plugin_common/Makefile.am index bbad0274..5147cdfa 100644 --- a/src/plugin_common/Makefile.am +++ b/src/plugin_common/Makefile.am @@ -31,7 +31,6 @@ libplugin_common_a_SOURCES = \ EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ README \ plugin_common_static.dsp diff --git a/src/plugin_winamp2/Makefile.am b/src/plugin_winamp2/Makefile.am index 99bfa896..0dd01627 100644 --- a/src/plugin_winamp2/Makefile.am +++ b/src/plugin_winamp2/Makefile.am @@ -18,7 +18,6 @@ SUBDIRS = include EXTRA_DIST = \ - Makefile.vc \ config.h \ config.c \ in_flac.c \ diff --git a/src/plugin_winamp3/README.txt b/src/plugin_winamp3/README.txt index ab7e9e23..bb285c0a 100644 --- a/src/plugin_winamp3/README.txt +++ b/src/plugin_winamp3/README.txt @@ -2,5 +2,4 @@ This plugin require the Wasabi SDK, and the project assumes that you have it installed in the standard place: \Wasabi SDK. If not, you will have to edit
the .dsp file to change the path.
-Also, you must build libFLAC first; if you haven't, cd to src\libFLAC and
-run 'nmake /f Makefile.vc'
+Also, you must build libFLAC first.
diff --git a/src/share/Makefile.am b/src/share/Makefile.am index a58879d2..e8b40252 100644 --- a/src/share/Makefile.am +++ b/src/share/Makefile.am @@ -19,5 +19,4 @@ SUBDIRS = gain_analysis getopt grabbag utf8 EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ README diff --git a/src/share/gain_analysis/Makefile.am b/src/share/gain_analysis/Makefile.am index 31003613..4ef6a945 100644 --- a/src/share/gain_analysis/Makefile.am +++ b/src/share/gain_analysis/Makefile.am @@ -10,7 +10,6 @@ libgain_analysis_a_SOURCES = gain_analysis.c EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ gain_analysis_static.dsp debug: diff --git a/src/share/getopt/Makefile.am b/src/share/getopt/Makefile.am index 44d25c4e..998ef492 100644 --- a/src/share/getopt/Makefile.am +++ b/src/share/getopt/Makefile.am @@ -10,7 +10,6 @@ libgetopt_a_SOURCES = getopt.c getopt1.c EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ getopt_static.dsp debug: diff --git a/src/share/grabbag/Makefile.am b/src/share/grabbag/Makefile.am index 0f2d4a39..e0705746 100644 --- a/src/share/grabbag/Makefile.am +++ b/src/share/grabbag/Makefile.am @@ -14,7 +14,6 @@ libgrabbag_a_SOURCES = \ EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ grabbag_static.dsp debug: diff --git a/src/share/utf8/Makefile.am b/src/share/utf8/Makefile.am index 245897ed..483a173b 100644 --- a/src/share/utf8/Makefile.am +++ b/src/share/utf8/Makefile.am @@ -10,7 +10,6 @@ libutf8_a_SOURCES = charset.c charset.h iconvert.c utf8.c EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ charmaps.h \ makemap.c \ charset_test.c \ diff --git a/src/test_grabbag/Makefile.am b/src/test_grabbag/Makefile.am index c2136619..8f6f4b6d 100644 --- a/src/test_grabbag/Makefile.am +++ b/src/test_grabbag/Makefile.am @@ -18,5 +18,4 @@ SUBDIRS = cuesheet EXTRA_DIST = \ - Makefile.lite \ - Makefile.vc + Makefile.lite diff --git a/src/test_grabbag/cuesheet/Makefile.am b/src/test_grabbag/cuesheet/Makefile.am index a7aace76..95ee2a9d 100644 --- a/src/test_grabbag/cuesheet/Makefile.am +++ b/src/test_grabbag/cuesheet/Makefile.am @@ -17,7 +17,6 @@ EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ test_cuesheet.dsp CFLAGS = @CFLAGS@ diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am index 25234947..9555865f 100644 --- a/src/test_libFLAC++/Makefile.am +++ b/src/test_libFLAC++/Makefile.am @@ -19,7 +19,6 @@ CFLAGS = @CFLAGS@ EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ README \ test_libFLAC++.dsp diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am index 69577b93..cadf42f7 100644 --- a/src/test_libFLAC/Makefile.am +++ b/src/test_libFLAC/Makefile.am @@ -17,7 +17,6 @@ EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ test_libFLAC.dsp CFLAGS = @CFLAGS@ diff --git a/src/test_libOggFLAC++/Makefile.am b/src/test_libOggFLAC++/Makefile.am index 48e48c18..98470c13 100644 --- a/src/test_libOggFLAC++/Makefile.am +++ b/src/test_libOggFLAC++/Makefile.am @@ -17,7 +17,6 @@ EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ README \ test_libOggFLAC++.dsp diff --git a/src/test_libOggFLAC/Makefile.am b/src/test_libOggFLAC/Makefile.am index f99a0520..067b6d12 100644 --- a/src/test_libOggFLAC/Makefile.am +++ b/src/test_libOggFLAC/Makefile.am @@ -17,7 +17,6 @@ EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ test_libOggFLAC.dsp CFLAGS = @CFLAGS@ @OGG_CFLAGS@ diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am index 04801082..e5f1b904 100644 --- a/src/test_streams/Makefile.am +++ b/src/test_streams/Makefile.am @@ -17,7 +17,6 @@ EXTRA_DIST = \ Makefile.lite \ - Makefile.vc \ test_streams.dsp CFLAGS = @CFLAGS@ |