Add MSP build files and modifications

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..f6284a4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+temp/
+/vorbis.dll
+/vorbis.lib
+/vorbis.pdb
+/vorbis_static.lib
+/vorbisfile.dll
+/vorbisfile.lib
+/vorbisfile.pdb
+/vorbisfile_static.lib

diff --git a/Build b/Build
new file mode 100644 (file)
index 0000000..7294b22
--- /dev/null
+++ b/Build
@@ -0,0 +1,87 @@
+package "vorbisfile"
+{
+       require "ogg";
+
+       library "vorbis"
+       {
+               source "lib/envelope.h";
+               source "lib/lpc.h";
+               source "lib/lsp.h";
+               source "lib/codebook.h";
+               source "lib/misc.h";
+               source "lib/psy.h";
+               source "lib/masking.h";
+               source "lib/os.h";
+               source "lib/mdct.h";
+               source "lib/smallft.h";
+               source "lib/highlevel.h";
+               source "lib/registry.h";
+               source "lib/scales.h";
+               source "lib/window.h";
+               source "lib/lookup.h";
+               source "lib/lookup_data.h";
+               source "lib/codec_internal.h";
+               source "lib/backends.h";
+               source "lib/bitrate.h";
+               source "lib/mdct.c";
+               source "lib/smallft.c";
+               source "lib/block.c";
+               source "lib/envelope.c";
+               source "lib/window.c";
+               source "lib/lsp.c";
+               source "lib/lpc.c";
+               source "lib/analysis.c";
+               source "lib/synthesis.c";
+               source "lib/psy.c";
+               source "lib/info.c";
+               source "lib/floor1.c";
+               source "lib/floor0.c";
+               source "lib/res0.c";
+               source "lib/mapping0.c";
+               source "lib/registry.c";
+               source "lib/codebook.c";
+               source "lib/sharedbook.c";
+               source "lib/lookup.c";
+               source "lib/bitrate.c";
+               if_arch "windows"
+               {
+                       source "win32/vorbis.def";
+               };
+               if_arch "msvc"
+               {
+                       build_info
+                       {
+                               warning_level 1;
+                               define "_CRT_SECURE_NO_WARNINGS" "1";
+                       };
+               };
+               install true;
+               install_headers false;
+       };
+
+       library "vorbisfile"
+       {
+               source "lib/vorbisfile.c";
+               if_arch "windows"
+               {
+                       source "win32/vorbisfile.def";
+               };
+               if_arch "msvc"
+               {
+                       build_info
+                       {
+                               define "_CRT_SECURE_NO_WARNINGS" "1";
+                       };
+               };
+               use "vorbis";
+               install true;
+               install_headers false;
+       };
+
+       install "include/vorbis"
+       {
+               source "include/vorbis/codec.h";
+               source "include/vorbis/vorbisenc.h";
+               source "include/vorbis/vorbisfile.h";
+       };
+};

diff --git a/lib/backends.h b/lib/backends.h
index 670b0b902ebda71b6800fba725032e8f57077b2c..9ffece472ac9cfdf1781aeaef4eda10ac0061547 100644 (file)
--- a/lib/backends.h
+++ b/lib/backends.h
@@ -22,8 +22,6 @@
 #ifndef _vorbis_backend_h_
 #define _vorbis_backend_h_
 
-#include "codec_internal.h"
-
 /* this would all be simpler/shorter with templates, but.... */
 /* Floor backend generic *****************************************/
 typedef struct{

diff --git a/lib/bitrate.h b/lib/bitrate.h
index 48fa150596feb1988185bab8cfceaff1572da9bc..b49820cf28917f09c55e29e4bc6a45f7d920b409 100644 (file)
--- a/lib/bitrate.h
+++ b/lib/bitrate.h
@@ -18,7 +18,6 @@
 #define _V_BITRATE_H_
 
 #include "vorbis/codec.h"
-#include "codec_internal.h"
 #include "os.h"
 
 /* encode side bitrate tracking */

diff --git a/win32/vorbis.def b/win32/vorbis.def
index 884f8f023cf76aa4afc58f675e8e7652570e5f52..f444057c31f174603a0e31fb833ce1919e8cf644 100644 (file)
--- a/win32/vorbis.def
+++ b/win32/vorbis.def
@@ -48,11 +48,5 @@ vorbis_synthesis_idheader
 ;
 vorbis_window
 ;_analysis_output_always
-vorbis_encode_init
-vorbis_encode_setup_managed
-vorbis_encode_setup_vbr
-vorbis_encode_init_vbr
-vorbis_encode_setup_init
-vorbis_encode_ctl
 ;
 vorbis_version_string