rename mac build directory to macos/

svn path=/trunk/vorbis/; revision=3617

diff --git a/mac/compat/strdup.c b/mac/compat/strdup.c
deleted file mode 100644 (file)
index 2ef4279..0000000
--- a/mac/compat/strdup.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <ogg/os_types.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-
-char *strdup(const char *inStr)
-{
-       char *outStr = NULL;
-       
-       if (inStr == NULL) {
-               return NULL;
-       }
-       
-       outStr = _ogg_malloc(strlen(inStr) + 1);
-       
-       if (outStr != NULL) {
-               strcpy(outStr, inStr);
-       }
-       
-       return outStr;
-}

diff --git a/mac/compat/sys/types.h b/mac/compat/sys/types.h
deleted file mode 100644 (file)
index b0d4f92..0000000
--- a/mac/compat/sys/types.h
+++ /dev/null
@@ -1 +0,0 @@
-#ifndef __SYS_TYPES_H__\r#define __SYS_TYPES_H__ 1\r\r#include <MacTypes.h>\r#include <alloca.h>\r#include <string.h>\r\rtypedef short                int16_t;\rtypedef long           int32_t;\rtypedef long long      int64_t;\r\r#define vorbis_size32_t long\r\r\r#if defined(__cplusplus)\rextern "C" {\r#endif\r\r#pragma options align=power\r\rchar *strdup(const char *inStr);\r\r#pragma options align=reset\r\r#if defined(__cplusplus)\r}\r#endif\r\r#endif /* __SYS_TYPES_H__ */\r
\ No newline at end of file

diff --git a/mac/decoder_example.mcp b/mac/decoder_example.mcp
deleted file mode 100644 (file)
index a6c57f7..0000000
Binary files a/mac/decoder_example.mcp and /dev/null differ

diff --git a/mac/libvorbis.mcp b/mac/libvorbis.mcp
deleted file mode 100644 (file)
index 47b7956..0000000
Binary files a/mac/libvorbis.mcp and /dev/null differ

diff --git a/mac/libvorbis.mcp.exp b/mac/libvorbis.mcp.exp
deleted file mode 100644 (file)
index fc4d92a..0000000
--- a/mac/libvorbis.mcp.exp
+++ /dev/null
@@ -1,40 +0,0 @@
-### From "vorbis/codec.h"
-
-# Vorbis PRIMITIVES: general
-
-vorbis_info_init
-vorbis_info_clear
-vorbis_info_blocksize
-vorbis_comment_init
-vorbis_comment_add
-vorbis_comment_add_tag
-vorbis_comment_query
-vorbis_comment_query_count
-vorbis_comment_clear
-
-vorbis_block_init
-vorbis_block_clear
-vorbis_dsp_clear
-
-# Vorbis PRIMITIVES: analysis/DSP layer
-
-vorbis_analysis_init
-vorbis_commentheader_out
-vorbis_analysis_headerout
-vorbis_analysis_buffer
-vorbis_analysis_wrote
-vorbis_analysis_blockout
-vorbis_analysis
-vorbis_bitrate_addblock
-vorbis_bitrate_flushpacket
-
-# Vorbis PRIMITIVES: synthesis layer
-
-vorbis_synthesis_headerin
-vorbis_synthesis_init
-vorbis_synthesis
-vorbis_synthesis_trackonly
-vorbis_synthesis_blockin
-vorbis_synthesis_pcmout
-vorbis_synthesis_read
-vorbis_packet_blocksize

diff --git a/mac/libvorbisenc.mcp b/mac/libvorbisenc.mcp
deleted file mode 100755 (executable)
index 2b30cf7..0000000
Binary files a/mac/libvorbisenc.mcp and /dev/null differ

diff --git a/mac/libvorbisenc.mcp.exp b/mac/libvorbisenc.mcp.exp
deleted file mode 100755 (executable)
index d71a21d..0000000
--- a/mac/libvorbisenc.mcp.exp
+++ /dev/null
@@ -1,8 +0,0 @@
-### From "vorbis/vorbisenc.h"
-
-vorbis_encode_init
-vorbis_encode_setup_managed
-vorbis_encode_setup_vbr
-vorbis_encode_init_vbr
-vorbis_encode_setup_init
-vorbis_encode_ctl

diff --git a/mac/libvorbisfile.mcp b/mac/libvorbisfile.mcp
deleted file mode 100755 (executable)
index fa878de..0000000
Binary files a/mac/libvorbisfile.mcp and /dev/null differ

diff --git a/mac/libvorbisfile.mcp.exp b/mac/libvorbisfile.mcp.exp
deleted file mode 100755 (executable)
index 6c37113..0000000
--- a/mac/libvorbisfile.mcp.exp
+++ /dev/null
@@ -1,35 +0,0 @@
-### From "vorbis/vorbisfile.h"
-
-ov_clear
-ov_open
-ov_open_callbacks
-
-ov_test
-ov_test_callbacks
-ov_test_open
-
-ov_bitrate
-ov_bitrate_instant
-ov_streams
-ov_seekable
-ov_serialnumber
-
-ov_raw_total
-ov_pcm_total
-ov_time_total
-
-ov_raw_seek
-ov_pcm_seek
-ov_pcm_seek_page
-ov_time_seek
-ov_time_seek_page
-
-ov_raw_tell
-ov_pcm_tell
-ov_time_tell
-
-ov_info
-ov_comment
-
-ov_read
-ov_read_float
\ No newline at end of file

diff --git a/macos/compat/strdup.c b/macos/compat/strdup.c
new file mode 100644 (file)
index 0000000..2ef4279
--- /dev/null
+++ b/macos/compat/strdup.c
@@ -0,0 +1,21 @@
+#include <ogg/os_types.h>
+#include <sys/types.h>
+#include <string.h>
+#include <stdlib.h>
+
+char *strdup(const char *inStr)
+{
+       char *outStr = NULL;
+       
+       if (inStr == NULL) {
+               return NULL;
+       }
+       
+       outStr = _ogg_malloc(strlen(inStr) + 1);
+       
+       if (outStr != NULL) {
+               strcpy(outStr, inStr);
+       }
+       
+       return outStr;
+}

diff --git a/macos/compat/sys/types.h b/macos/compat/sys/types.h
new file mode 100644 (file)
index 0000000..b0d4f92
--- /dev/null
+++ b/macos/compat/sys/types.h
@@ -0,0 +1 @@
+#ifndef __SYS_TYPES_H__\r#define __SYS_TYPES_H__ 1\r\r#include <MacTypes.h>\r#include <alloca.h>\r#include <string.h>\r\rtypedef short                int16_t;\rtypedef long           int32_t;\rtypedef long long      int64_t;\r\r#define vorbis_size32_t long\r\r\r#if defined(__cplusplus)\rextern "C" {\r#endif\r\r#pragma options align=power\r\rchar *strdup(const char *inStr);\r\r#pragma options align=reset\r\r#if defined(__cplusplus)\r}\r#endif\r\r#endif /* __SYS_TYPES_H__ */\r
\ No newline at end of file

diff --git a/macos/decoder_example.mcp b/macos/decoder_example.mcp
new file mode 100644 (file)
index 0000000..a6c57f7
Binary files /dev/null and b/macos/decoder_example.mcp differ

diff --git a/macos/encoder_example.mcp b/macos/encoder_example.mcp
new file mode 100644 (file)
index 0000000..fce944f
Binary files /dev/null and b/macos/encoder_example.mcp differ

diff --git a/macos/libvorbis.mcp b/macos/libvorbis.mcp
new file mode 100644 (file)
index 0000000..47b7956
Binary files /dev/null and b/macos/libvorbis.mcp differ

diff --git a/macos/libvorbis.mcp.exp b/macos/libvorbis.mcp.exp
new file mode 100644 (file)
index 0000000..fc4d92a
--- /dev/null
+++ b/macos/libvorbis.mcp.exp
@@ -0,0 +1,40 @@
+### From "vorbis/codec.h"
+
+# Vorbis PRIMITIVES: general
+
+vorbis_info_init
+vorbis_info_clear
+vorbis_info_blocksize
+vorbis_comment_init
+vorbis_comment_add
+vorbis_comment_add_tag
+vorbis_comment_query
+vorbis_comment_query_count
+vorbis_comment_clear
+
+vorbis_block_init
+vorbis_block_clear
+vorbis_dsp_clear
+
+# Vorbis PRIMITIVES: analysis/DSP layer
+
+vorbis_analysis_init
+vorbis_commentheader_out
+vorbis_analysis_headerout
+vorbis_analysis_buffer
+vorbis_analysis_wrote
+vorbis_analysis_blockout
+vorbis_analysis
+vorbis_bitrate_addblock
+vorbis_bitrate_flushpacket
+
+# Vorbis PRIMITIVES: synthesis layer
+
+vorbis_synthesis_headerin
+vorbis_synthesis_init
+vorbis_synthesis
+vorbis_synthesis_trackonly
+vorbis_synthesis_blockin
+vorbis_synthesis_pcmout
+vorbis_synthesis_read
+vorbis_packet_blocksize

diff --git a/macos/libvorbisenc.mcp b/macos/libvorbisenc.mcp
new file mode 100755 (executable)
index 0000000..2b30cf7
Binary files /dev/null and b/macos/libvorbisenc.mcp differ

diff --git a/macos/libvorbisenc.mcp.exp b/macos/libvorbisenc.mcp.exp
new file mode 100755 (executable)
index 0000000..d71a21d
--- /dev/null
+++ b/macos/libvorbisenc.mcp.exp
@@ -0,0 +1,8 @@
+### From "vorbis/vorbisenc.h"
+
+vorbis_encode_init
+vorbis_encode_setup_managed
+vorbis_encode_setup_vbr
+vorbis_encode_init_vbr
+vorbis_encode_setup_init
+vorbis_encode_ctl

diff --git a/macos/libvorbisfile.mcp b/macos/libvorbisfile.mcp
new file mode 100755 (executable)
index 0000000..fa878de
Binary files /dev/null and b/macos/libvorbisfile.mcp differ

diff --git a/macos/libvorbisfile.mcp.exp b/macos/libvorbisfile.mcp.exp
new file mode 100755 (executable)
index 0000000..6c37113
--- /dev/null
+++ b/macos/libvorbisfile.mcp.exp
@@ -0,0 +1,35 @@
+### From "vorbis/vorbisfile.h"
+
+ov_clear
+ov_open
+ov_open_callbacks
+
+ov_test
+ov_test_callbacks
+ov_test_open
+
+ov_bitrate
+ov_bitrate_instant
+ov_streams
+ov_seekable
+ov_serialnumber
+
+ov_raw_total
+ov_pcm_total
+ov_time_total
+
+ov_raw_seek
+ov_pcm_seek
+ov_pcm_seek_page
+ov_time_seek
+ov_time_seek_page
+
+ov_raw_tell
+ov_pcm_tell
+ov_time_tell
+
+ov_info
+ov_comment
+
+ov_read
+ov_read_float
\ No newline at end of file

diff --git a/macos/vorbis.mcp b/macos/vorbis.mcp
new file mode 100644 (file)
index 0000000..fcfde7b
Binary files /dev/null and b/macos/vorbis.mcp differ