Merge pull request #5 from WinampDesktop/community

Merge to main

10 files changed, 353 insertions, 0 deletions

diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-mpg123.lua b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-mpg123.lua
new file mode 100644
index 00000000..12da351a
--- /dev/null
+++ b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-mpg123.lua
@@ -0,0 +1,48 @@
+ 
+ project "mpg123"
+  uuid "7adfafb9-0a83-4d35-9891-fb24fdf30b53"
+  language "C"
+  location ( "../../build/" .. mpt_projectpathname .. "/ext" )
+  mpt_projectname = "mpg123"
+  dofile "../../build/xcode-genie/genie-defaults-DLL.lua"
+  dofile "../../build/xcode-genie/genie-defaults.lua"
+  targetname "openmpt-mpg123"
+  includedirs {
+   "../../include/mpg123/ports/Xcode",
+   "../../include/mpg123/src/libmpg123",
+   "../../include/mpg123/src/compat",
+   "../../include/mpg123/src",
+  }
+  files {
+   "../../include/mpg123/src/compat/compat.c",
+   "../../include/mpg123/src/compat/compat_str.c",
+  }
+  files {
+   "../../include/mpg123/src/libmpg123/dct64.c",
+   --"../../include/mpg123/src/libmpg123/dither.c",
+   "../../include/mpg123/src/libmpg123/equalizer.c",
+   "../../include/mpg123/src/libmpg123/feature.c",
+   "../../include/mpg123/src/libmpg123/format.c",
+   "../../include/mpg123/src/libmpg123/frame.c",
+   "../../include/mpg123/src/libmpg123/icy.c",
+   "../../include/mpg123/src/libmpg123/icy2utf8.c",
+   "../../include/mpg123/src/libmpg123/id3.c",
+   "../../include/mpg123/src/libmpg123/index.c",
+   "../../include/mpg123/src/libmpg123/layer1.c",
+   "../../include/mpg123/src/libmpg123/layer2.c",
+   "../../include/mpg123/src/libmpg123/layer3.c",
+   --"../../include/mpg123/src/libmpg123/lfs_alias.c",
+   --"../../include/mpg123/src/libmpg123/lfs_wrap.c",
+   "../../include/mpg123/src/libmpg123/libmpg123.c",
+   "../../include/mpg123/src/libmpg123/ntom.c",
+   "../../include/mpg123/src/libmpg123/optimize.c",
+   "../../include/mpg123/src/libmpg123/parse.c",
+   "../../include/mpg123/src/libmpg123/readers.c",
+   "../../include/mpg123/src/libmpg123/stringbuf.c",
+   "../../include/mpg123/src/libmpg123/synth.c",
+   "../../include/mpg123/src/libmpg123/synth_8bit.c",
+   "../../include/mpg123/src/libmpg123/synth_real.c",
+   "../../include/mpg123/src/libmpg123/synth_s32.c",
+   "../../include/mpg123/src/libmpg123/tabinit.c",
+  }
+  defines { "OPT_GENERIC" }
diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-ogg.lua b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-ogg.lua
new file mode 100644
index 00000000..ba44c0ef
--- /dev/null
+++ b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-ogg.lua
@@ -0,0 +1,17 @@
+ 
+ project "ogg"
+  uuid "d8d5e11c-f959-49ef-b741-b3f6de52ded8"
+  language "C"
+  location ( "../../build/" .. mpt_projectpathname .. "/ext" )
+  mpt_projectname = "ogg"
+  dofile "../../build/xcode-genie/genie-defaults-LIBorDLL.lua"
+  dofile "../../build/xcode-genie/genie-defaults.lua"
+  targetname "openmpt-ogg"
+  includedirs { "../../include/ogg/include" }
+  files {
+   "../../include/ogg/include/ogg/ogg.h",
+   "../../include/ogg/include/ogg/os_types.h",
+   "../../include/ogg/src/bitwise.c",
+   "../../include/ogg/src/framing.c",
+  }
+  configuration {}
diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-vorbis.lua b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-vorbis.lua
new file mode 100644
index 00000000..f120c4c0
--- /dev/null
+++ b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-vorbis.lua
@@ -0,0 +1,94 @@
+  
+ project "vorbis"
+  -- NOTE: Unlike the official libvorbis, we built everything into a single library instead of the vorbis, vorbisenc, vorbisfile split.
+  uuid "b544dcb7-16e5-41bc-b51b-7ead8cfdfa05"
+  language "C"
+  location ( "../../build/" .. mpt_projectpathname .. "/ext" )
+  mpt_projectname = "vorbis"
+  dofile "../../build/xcode-genie/genie-defaults-LIBorDLL.lua"
+  dofile "../../build/xcode-genie/genie-defaults.lua"
+  targetname "openmpt-vorbis"
+  local extincludedirs = {
+   "../../include/ogg/include",
+	}
+		includedirs ( extincludedirs )
+  includedirs {
+   "../../include/vorbis/include",
+   "../../include/vorbis/lib",
+  }
+  files {
+   "../../include/vorbis/include/vorbis/codec.h",
+   "../../include/vorbis/include/vorbis/vorbisenc.h",
+   "../../include/vorbis/include/vorbis/vorbisfile.h",
+  }
+  files {
+   "../../include/vorbis/lib/analysis.c",
+   "../../include/vorbis/lib/backends.h",
+   --"../../include/vorbis/lib/barkmel.c",
+   "../../include/vorbis/lib/bitrate.c",
+   "../../include/vorbis/lib/bitrate.h",
+   "../../include/vorbis/lib/block.c",
+   "../../include/vorbis/lib/codebook.c",
+   "../../include/vorbis/lib/codebook.h",
+   "../../include/vorbis/lib/codec_internal.h",
+   "../../include/vorbis/lib/envelope.c",
+   "../../include/vorbis/lib/envelope.h",
+   "../../include/vorbis/lib/floor0.c",
+   "../../include/vorbis/lib/floor1.c",
+   "../../include/vorbis/lib/highlevel.h",
+   "../../include/vorbis/lib/info.c",
+   "../../include/vorbis/lib/lookup.c",
+   "../../include/vorbis/lib/lookup.h",
+   "../../include/vorbis/lib/lookup_data.h",
+   "../../include/vorbis/lib/lpc.c",
+   "../../include/vorbis/lib/lpc.h",
+   "../../include/vorbis/lib/lsp.c",
+   "../../include/vorbis/lib/lsp.h",
+   "../../include/vorbis/lib/mapping0.c",
+   "../../include/vorbis/lib/masking.h",
+   "../../include/vorbis/lib/mdct.c",
+   "../../include/vorbis/lib/mdct.h",
+   "../../include/vorbis/lib/misc.h",
+   "../../include/vorbis/lib/os.h",
+   "../../include/vorbis/lib/psy.c",
+   "../../include/vorbis/lib/psy.h",
+   -- "../../include/vorbis/lib/psytune.c",
+   "../../include/vorbis/lib/registry.c",
+   "../../include/vorbis/lib/registry.h",
+   "../../include/vorbis/lib/res0.c",
+   "../../include/vorbis/lib/scales.h",
+   "../../include/vorbis/lib/sharedbook.c",
+   "../../include/vorbis/lib/smallft.c",
+   "../../include/vorbis/lib/smallft.h",
+   "../../include/vorbis/lib/synthesis.c",
+   -- "../../include/vorbis/lib/tone.c",
+   "../../include/vorbis/lib/vorbisenc.c",
+   "../../include/vorbis/lib/vorbisfile.c",
+   "../../include/vorbis/lib/window.c",
+   "../../include/vorbis/lib/window.h",
+   "../../include/vorbis/lib/books/coupled/res_books_51.h",
+   "../../include/vorbis/lib/books/coupled/res_books_stereo.h",
+   "../../include/vorbis/lib/books/floor/floor_books.h",
+   "../../include/vorbis/lib/books/uncoupled/res_books_uncoupled.h",
+   "../../include/vorbis/lib/modes/floor_all.h",
+   "../../include/vorbis/lib/modes/psych_8.h",
+   "../../include/vorbis/lib/modes/psych_11.h",
+   "../../include/vorbis/lib/modes/psych_16.h",
+   "../../include/vorbis/lib/modes/psych_44.h",
+   "../../include/vorbis/lib/modes/residue_8.h",
+   "../../include/vorbis/lib/modes/residue_16.h",
+   "../../include/vorbis/lib/modes/residue_44.h",
+   "../../include/vorbis/lib/modes/residue_44p51.h",
+   "../../include/vorbis/lib/modes/residue_44u.h",
+   "../../include/vorbis/lib/modes/setup_8.h",
+   "../../include/vorbis/lib/modes/setup_11.h",
+   "../../include/vorbis/lib/modes/setup_16.h",
+   "../../include/vorbis/lib/modes/setup_22.h",
+   "../../include/vorbis/lib/modes/setup_32.h",
+   "../../include/vorbis/lib/modes/setup_44.h",
+   "../../include/vorbis/lib/modes/setup_44p51.h",
+   "../../include/vorbis/lib/modes/setup_44u.h",
+   "../../include/vorbis/lib/modes/setup_X.h",
+  }
+  links { "ogg" }
+  configuration {}
diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-zlib.lua b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-zlib.lua
new file mode 100644
index 00000000..e7924cc6
--- /dev/null
+++ b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/ext-zlib.lua
@@ -0,0 +1,42 @@
+  
+ project "zlib"
+  uuid "1654FB18-FDE6-406F-9D84-BA12BFBD67B2"
+  language "C"
+  location ( "../../build/" .. mpt_projectpathname .. "/ext" )
+  mpt_projectname = "zlib"
+  dofile "../../build/xcode-genie/genie-defaults-LIBorDLL.lua"
+  dofile "../../build/xcode-genie/genie-defaults.lua"
+  targetname "openmpt-zlib"
+  includedirs { "../../include/zlib" }
+  files {
+   "../../include/zlib/adler32.c",
+   "../../include/zlib/compress.c",
+   "../../include/zlib/crc32.c",
+   "../../include/zlib/deflate.c",
+   "../../include/zlib/gzclose.c",
+   "../../include/zlib/gzlib.c",
+   "../../include/zlib/gzread.c",
+   "../../include/zlib/gzwrite.c",
+   "../../include/zlib/infback.c",
+   "../../include/zlib/inffast.c",
+   "../../include/zlib/inflate.c",
+   "../../include/zlib/inftrees.c",
+   "../../include/zlib/trees.c",
+   "../../include/zlib/uncompr.c",
+   "../../include/zlib/zutil.c",
+  }
+  files {
+   "../../include/zlib/crc32.h",
+   "../../include/zlib/deflate.h",
+   "../../include/zlib/gzguts.h",
+   "../../include/zlib/inffast.h",
+   "../../include/zlib/inffixed.h",
+   "../../include/zlib/inflate.h",
+   "../../include/zlib/inftrees.h",
+   "../../include/zlib/trees.h",
+   "../../include/zlib/zconf.h",
+   "../../include/zlib/zlib.h",
+   "../../include/zlib/zutil.h",
+  }
+
+  configuration {}
diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults-DLL.lua b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults-DLL.lua
new file mode 100644
index 00000000..12572e79
--- /dev/null
+++ b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults-DLL.lua
@@ -0,0 +1,3 @@
+
+configuration {}
+   kind "SharedLib"
diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults-LIB.lua b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults-LIB.lua
new file mode 100644
index 00000000..bdebdb2f
--- /dev/null
+++ b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults-LIB.lua
@@ -0,0 +1,3 @@
+
+configuration {}
+   kind "StaticLib"
diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults-LIBorDLL.lua b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults-LIBorDLL.lua
new file mode 100644
index 00000000..2fb5ca28
--- /dev/null
+++ b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults-LIBorDLL.lua
@@ -0,0 +1,10 @@
+
+configuration {}
+
+configuration "Debug"
+	kind "SharedLib"
+
+configuration "Release"
+	kind "SharedLib"
+
+configuration {}
diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults.lua b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults.lua
new file mode 100644
index 00000000..c933aab2
--- /dev/null
+++ b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie-defaults.lua
@@ -0,0 +1,22 @@
+
+	configuration {}
+
+	configuration { "Debug" }
+		targetdir ( "../../bin/debug/" .. _ACTION .. "-" .. _OPTIONS["target"] .. "/all" )
+	configuration { "Release" }
+		targetdir ( "../../bin/release/" .. _ACTION .. "-" .. _OPTIONS["target"] .. "/all" )
+
+	configuration "Debug"
+		defines { "DEBUG" }
+		defines { "MPT_BUILD_DEBUG" }
+		flags { "Symbols" }
+
+	configuration "Release"
+		defines { "NDEBUG" }
+		flags { "OptimizeSpeed" }
+
+	configuration {}
+		defines { "MPT_BUILD_XCODE" }
+		premake.xcode.toolset = _OPTIONS["target"]
+
+	configuration {}
diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie.lua b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie.lua
new file mode 100644
index 00000000..35fc9223
--- /dev/null
+++ b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/genie.lua
@@ -0,0 +1,35 @@
+
+newoption {
+ trigger     = "group",
+ value       = "PROJECTS",
+ description = "OpenMPT project group",
+ allowed = {
+  { "libopenmpt", "libopenmpt" },
+ }
+}
+
+
+newoption {
+ trigger     = "target",
+ value       = "PROJECTS",
+ description = "windows target platform",
+ allowed = {
+  { "macosx"  , "macosx"   },
+  { "iphoneos", "iphoneos" },
+ }
+}
+
+
+mpt_projectpathname = _ACTION .. "-" .. _OPTIONS["target"]
+mpt_bindirsuffix = _OPTIONS["target"]
+
+solution "libopenmpt"
+ location ( "../../build/" .. mpt_projectpathname )
+ configurations { "Debug", "Release" }
+
+ dofile "../../build/xcode-genie/mpt-libopenmpt.lua"
+ dofile "../../build/xcode-genie/ext-mpg123.lua"
+ dofile "../../build/xcode-genie/ext-ogg.lua"
+ dofile "../../build/xcode-genie/ext-vorbis.lua"
+-- dofile "../../build/xcode-genie/ext-zlib.lua"
+
diff --git a/Src/external_dependencies/openmpt-trunk/build/xcode-genie/mpt-libopenmpt.lua b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/mpt-libopenmpt.lua
new file mode 100644
index 00000000..7f50e559
--- /dev/null
+++ b/Src/external_dependencies/openmpt-trunk/build/xcode-genie/mpt-libopenmpt.lua
@@ -0,0 +1,79 @@
+ 
+ project "libopenmpt"
+  uuid "9C5101EF-3E20-4558-809B-277FDD50E878"
+  language "C++"
+  location ( "../../build/" .. mpt_projectpathname )
+  vpaths { ["*"] = "../../" }
+  mpt_projectname = "libopenmpt"
+  dofile "../../build/xcode-genie/genie-defaults-LIBorDLL.lua"
+  dofile "../../build/xcode-genie/genie-defaults.lua"
+  local extincludedirs = {
+   "../../include/mpg123/ports/Xcode",
+   "../../include/mpg123/src/libmpg123",
+   "../../include/ogg/include",
+   "../../include/vorbis/include",
+--   "../../include/zlib",
+  }
+  includedirs ( extincludedirs )
+  includedirs {
+   "../..",
+   "../../src",
+   "../../common",
+   "../../soundlib",
+   "$(IntDir)/svn_version",
+   "../../build/svn_version",
+  }
+  files {
+   "../../src/mpt/**.cpp",
+   "../../src/mpt/**.hpp",
+   "../../common/*.cpp",
+   "../../common/*.h",
+   "../../soundbase/*.cpp",
+   "../../soundbase/*.h",
+   "../../soundlib/*.cpp",
+   "../../soundlib/*.h",
+   "../../soundlib/plugins/*.cpp",
+   "../../soundlib/plugins/*.h",
+   "../../soundlib/plugins/dmo/*.cpp",
+   "../../soundlib/plugins/dmo/*.h",
+   "../../sounddsp/*.cpp",
+   "../../sounddsp/*.h",
+   "../../libopenmpt/libopenmpt.h",
+   "../../libopenmpt/libopenmpt.hpp",
+   "../../libopenmpt/libopenmpt_config.h",
+   "../../libopenmpt/libopenmpt_ext.h",
+   "../../libopenmpt/libopenmpt_ext.hpp",
+   "../../libopenmpt/libopenmpt_ext_impl.hpp",
+   "../../libopenmpt/libopenmpt_impl.hpp",
+   "../../libopenmpt/libopenmpt_internal.h",
+   "../../libopenmpt/libopenmpt_stream_callbacks_buffer.h",
+   "../../libopenmpt/libopenmpt_stream_callbacks_fd.h",
+   "../../libopenmpt/libopenmpt_stream_callbacks_file.h",
+   "../../libopenmpt/libopenmpt_version.h",
+   "../../libopenmpt/libopenmpt_c.cpp",
+   "../../libopenmpt/libopenmpt_cxx.cpp",
+   "../../libopenmpt/libopenmpt_ext_impl.cpp",
+   "../../libopenmpt/libopenmpt_impl.cpp",
+  }
+	excludes {
+		"../../src/mpt/crypto/**.cpp",
+		"../../src/mpt/crypto/**.hpp",
+		"../../src/mpt/json/**.cpp",
+		"../../src/mpt/json/**.hpp",
+		"../../src/mpt/test/**.cpp",
+		"../../src/mpt/test/**.hpp",
+		"../../src/mpt/uuid_namespace/**.cpp",
+		"../../src/mpt/uuid_namespace/**.hpp",
+		"../../src/openmpt/sounddevice/**.cpp",
+		"../../src/openmpt/sounddevice/**.hpp",
+	}
+	configuration {}
+
+  defines { "LIBOPENMPT_BUILD" }
+  links {
+   "mpg123",
+   "vorbis",
+   "ogg",
+--   "zlib",
+   "z",
+  }