diff options
| author | Juan Linietsky | 2017-01-02 19:12:25 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-02 19:12:25 -0300 |
| commit | ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae (patch) | |
| tree | 5f9c387037d0142d40f7275575436483dc0a7237 /modules/mpc | |
| parent | ab4126f51061277e87b41c48b40e7b54942d4eca (diff) | |
| parent | 45c5c89de961357a7042d9e1f063e288d7a510cf (diff) | |
| download | godot-ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae.tar.gz godot-ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae.tar.zst godot-ce26eb74bca48f16e9a34b4eb1c34e50dfc5daae.zip | |
Diffstat (limited to 'modules/mpc')
| -rw-r--r-- | modules/mpc/SCsub | 30 | ||||
| -rw-r--r-- | modules/mpc/audio_stream_mpc.cpp | 2 | ||||
| -rw-r--r-- | modules/mpc/audio_stream_mpc.h | 2 | ||||
| -rw-r--r-- | modules/mpc/config.py | 5 | ||||
| -rw-r--r-- | modules/mpc/register_types.cpp | 2 | ||||
| -rw-r--r-- | modules/mpc/register_types.h | 2 |
6 files changed, 22 insertions, 21 deletions
diff --git a/modules/mpc/SCsub b/modules/mpc/SCsub index 09f0c05da..76b7cbea7 100644 --- a/modules/mpc/SCsub +++ b/modules/mpc/SCsub @@ -6,23 +6,23 @@ Import('env_modules') env_mpc = env_modules.Clone() # Thirdparty source files -if (env["libmpcdec"] != "system"): # builtin - thirdparty_dir = "#thirdparty/libmpcdec/" - thirdparty_sources = [ - "huffman.c", - "mpc_bits_reader.c", - "mpc_decoder.c", - "mpc_demux.c", - "mpc_reader.c", - "requant.c", - "streaminfo.c", - "synth_filter.c", - ] +if (env['builtin_libmpcdec'] != 'no'): + thirdparty_dir = "#thirdparty/libmpcdec/" + thirdparty_sources = [ + "huffman.c", + "mpc_bits_reader.c", + "mpc_decoder.c", + "mpc_demux.c", + "mpc_reader.c", + "requant.c", + "streaminfo.c", + "synth_filter.c", + ] - thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] + thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - env_mpc.add_source_files(env.modules_sources, thirdparty_sources) - env_mpc.Append(CPPPATH = [thirdparty_dir]) + env_mpc.add_source_files(env.modules_sources, thirdparty_sources) + env_mpc.Append(CPPPATH=[thirdparty_dir]) # Godot source files env_mpc.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/mpc/audio_stream_mpc.cpp b/modules/mpc/audio_stream_mpc.cpp index 9713eb3c7..befb8ea29 100644 --- a/modules/mpc/audio_stream_mpc.cpp +++ b/modules/mpc/audio_stream_mpc.cpp @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/modules/mpc/audio_stream_mpc.h b/modules/mpc/audio_stream_mpc.h index c982bdc35..9430f752f 100644 --- a/modules/mpc/audio_stream_mpc.h +++ b/modules/mpc/audio_stream_mpc.h @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/modules/mpc/config.py b/modules/mpc/config.py index 368e97e15..fb920482f 100644 --- a/modules/mpc/config.py +++ b/modules/mpc/config.py @@ -1,6 +1,7 @@ def can_build(platform): - return True + return True + def configure(env): - pass + pass diff --git a/modules/mpc/register_types.cpp b/modules/mpc/register_types.cpp index f6a1f59dc..7e962804b 100644 --- a/modules/mpc/register_types.cpp +++ b/modules/mpc/register_types.cpp @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/modules/mpc/register_types.h b/modules/mpc/register_types.h index 3d0661ed6..d1e692f25 100644 --- a/modules/mpc/register_types.h +++ b/modules/mpc/register_types.h @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ |