From 65d98d1f4bc2be73bd2f3d5ca85b374fa81b140d Mon Sep 17 00:00:00 2001 From: JP Cimalando Date: Sat, 15 Sep 2018 14:37:02 +0200 Subject: [PATCH] rename version.h because of potential name conflicts --- project/adl/ADLplug.jucer | 3 +- .../MacOSX/ADLplug.xcodeproj/project.pbxproj | 8 ++--- .../ADLplug_SharedCode.vcxproj | 2 +- .../ADLplug_SharedCode.vcxproj.filters | 2 +- project/opn/OPNplug.jucer | 3 +- .../MacOSX/OPNplug.xcodeproj/project.pbxproj | 36 +++++++++---------- .../OPNplug_SharedCode.vcxproj | 2 +- .../OPNplug_SharedCode.vcxproj.filters | 2 +- sources/opl3/ui/about_component.cc | 2 +- sources/opn2/ui/about_component.cc | 2 +- sources/{version.h => plugin_version.h} | 0 11 files changed, 32 insertions(+), 30 deletions(-) rename sources/{version.h => plugin_version.h} (100%) diff --git a/project/adl/ADLplug.jucer b/project/adl/ADLplug.jucer index 47d24ca6..b5ad0d17 100644 --- a/project/adl/ADLplug.jucer +++ b/project/adl/ADLplug.jucer @@ -25,7 +25,8 @@ file="../../sources/plugin_processor.cc"/> - + diff --git a/project/adl/juce/Builds/MacOSX/ADLplug.xcodeproj/project.pbxproj b/project/adl/juce/Builds/MacOSX/ADLplug.xcodeproj/project.pbxproj index 7619188e..a623f094 100644 --- a/project/adl/juce/Builds/MacOSX/ADLplug.xcodeproj/project.pbxproj +++ b/project/adl/juce/Builds/MacOSX/ADLplug.xcodeproj/project.pbxproj @@ -166,6 +166,7 @@ 4995D130B7082A7B8A8E2A49 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = messages.h; path = ../../../../../sources/messages.h; sourceTree = "SOURCE_ROOT"; }; 499D4152A633668F9B43E42B = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Sans-Regular.ttf.gz"; path = "../../../../../resources/ui/fonts/Sans-Regular.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; 4CBF4A4229D83CAF77F73BB9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "rt_checker.cc"; path = "../../../../../sources/utility/rt_checker.cc"; sourceTree = "SOURCE_ROOT"; }; + 4DE5AD038D18B74D184944BB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "plugin_version.h"; path = "../../../../../sources/plugin_version.h"; sourceTree = "SOURCE_ROOT"; }; 4F1C399BB2A3DA9FB801AB7A = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; }; 4F224488F513425A1724643E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "nukedopl3_174.c"; path = "../../../../../thirdparty/libADLMIDI/src/chips/nuked/nukedopl3_174.c"; sourceTree = "SOURCE_ROOT"; }; 4F4130D7715BF9BDDAACA1A7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = image.cc; path = ../../../../../sources/ui/utility/image.cc; sourceTree = "SOURCE_ROOT"; }; @@ -182,13 +183,11 @@ 60B1C1590C86BAFFDC923E8F = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 63A12DA9B20496CE53B56AC1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pak.cc; path = ../../../../../sources/utility/pak.cc; sourceTree = "SOURCE_ROOT"; }; 67794468768443D2AF7C3BF3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = adlmidi.cpp; path = ../../../../../thirdparty/libADLMIDI/src/adlmidi.cpp; sourceTree = "SOURCE_ROOT"; }; - 69359F629354765711B62B71 = {isa = PBXFileReference; lastKnownFileType = file.r; name = "include_juce_audio_plugin_client_RTAS.r"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_RTAS.r"; sourceTree = "SOURCE_ROOT"; }; 6ADAC80F9EE90ED0E82BB8E6 = {isa = PBXFileReference; lastKnownFileType = image.png; name = Nuked2.png; path = ../../../../../resources/ui/cores/Nuked2.png; sourceTree = "SOURCE_ROOT"; }; 6CCF6B638ECD7B17CFD4E609 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ranges.h; path = ../../../../../thirdparty/fmt/include/fmt/ranges.h; sourceTree = "SOURCE_ROOT"; }; 6D14D209C6DEEB625E0E709A = {isa = PBXFileReference; lastKnownFileType = image.png; name = "emoji_u1f4c2.png"; path = "../../../../../resources/ui/noto-emoji/emoji_u1f4c2.png"; sourceTree = "SOURCE_ROOT"; }; 6DE5B0661DDE99A2B4317BFC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "main_component.h"; path = "../../../../../sources/ui/main_component.h"; sourceTree = "SOURCE_ROOT"; }; 75186A344B8335E61B451BBF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "plugin_processor.h"; path = "../../../../../sources/plugin_processor.h"; sourceTree = "SOURCE_ROOT"; }; - 76F3C2FFC43C91ACBF0E25B6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = midi.h; path = ../../../../../sources/utility/midi.h; sourceTree = "SOURCE_ROOT"; }; B6C1A70C161F8AE51AF25B08 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ADLplug.dpm; sourceTree = "BUILT_PRODUCTS_DIR"; }; 31B682F29335A0E0B2D5E7EA = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ADLplug.component; sourceTree = "BUILT_PRODUCTS_DIR"; }; 5189F33ED9D651D2CBCA51DB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "parameter_block.h"; path = "../../../../../sources/parameter_block.h"; sourceTree = "SOURCE_ROOT"; }; @@ -196,6 +195,7 @@ 598DE8B9608A18ED9D0879EB = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ADLplug.app; sourceTree = "BUILT_PRODUCTS_DIR"; }; 5E328B93B15866216B0BFD92 = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libADLplug.a; sourceTree = "BUILT_PRODUCTS_DIR"; }; 645306E0190BF2B246376B16 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; }; + 69359F629354765711B62B71 = {isa = PBXFileReference; lastKnownFileType = file.r; name = "include_juce_audio_plugin_client_RTAS.r"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_RTAS.r"; sourceTree = "SOURCE_ROOT"; }; 69801E295DD25EEEA9538A0C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "plugin_editor.h"; path = "../../../../../sources/plugin_editor.h"; sourceTree = "SOURCE_ROOT"; }; 69DCF7A80C66B4C2F43C38DD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "styled_knobs.cc"; path = "../../../../../sources/ui/components/styled_knobs.cc"; sourceTree = "SOURCE_ROOT"; }; 6E283C1D8C5C3449C29776A9 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_formats"; path = "../../../../../thirdparty/JUCE/modules/juce_audio_formats"; sourceTree = "SOURCE_ROOT"; }; @@ -205,6 +205,7 @@ 764182FD5E739A636D11084E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = BinaryData.cpp; path = ../../../JuceLibraryCode/BinaryData.cpp; sourceTree = "SOURCE_ROOT"; }; 76B14A63C191BA5C956F8B18 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "dc_filter.h"; path = "../../../../../sources/dsp/dc_filter.h"; sourceTree = "SOURCE_ROOT"; }; 76EF6D9BF52D4DE01ADF22CB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_RTAS_4.cpp"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_RTAS_4.cpp"; sourceTree = "SOURCE_ROOT"; }; + 76F3C2FFC43C91ACBF0E25B6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = midi.h; path = ../../../../../sources/utility/midi.h; sourceTree = "SOURCE_ROOT"; }; 77A702061C4B79A590360ED4 = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Mono-BoldItalic.ttf.gz"; path = "../../../../../resources/ui/fonts/Mono-BoldItalic.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; 77D3CE7D7A3DA47ED46F2120 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "about_component.cc"; path = "../../../../../sources/opl3/ui/about_component.cc"; sourceTree = "SOURCE_ROOT"; }; 7927F7FB86A5804E6DDE0950 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = waves.h; path = ../../../../../sources/ui/components/waves.h; sourceTree = "SOURCE_ROOT"; }; @@ -224,7 +225,6 @@ 8A46F8FF8245C59B01A91377 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_devices.mm"; path = "../../../JuceLibraryCode/include_juce_audio_devices.mm"; sourceTree = "SOURCE_ROOT"; }; 8ADF6841815023991BFAFECF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "algorithm_component.cc"; path = "../../../../../sources/ui/components/algorithm_component.cc"; sourceTree = "SOURCE_ROOT"; }; 8B1F667419831AAAF689C52F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "dosbox_opl3.h"; path = "../../../../../sources/opl3/adl/measurer/chips/dosbox_opl3.h"; sourceTree = "SOURCE_ROOT"; }; - 8D9B99110D1E3C34ABDEBFDC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../../../../../sources/version.h; sourceTree = "SOURCE_ROOT"; }; 8E00A7AAECFD41B29FB46129 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_utils"; path = "../../../../../thirdparty/JUCE/modules/juce_audio_utils"; sourceTree = "SOURCE_ROOT"; }; 8E69FF0C2C1A9B399C7D1C66 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "knobman_skin.cc"; path = "../../../../../sources/ui/utility/knobman_skin.cc"; sourceTree = "SOURCE_ROOT"; }; 907D7C41E35DB01AA436E95D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_VST2.cpp"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_VST2.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -424,7 +424,7 @@ 69801E295DD25EEEA9538A0C, ACC517C2B8C4F347E6EF835E, 75186A344B8335E61B451BBF, - 8D9B99110D1E3C34ABDEBFDC, + 4DE5AD038D18B74D184944BB, BAAE4D6492B736A0C7A695FB, 982B66D9E9D3B65A925E7997, 0B35D66E96610B76C2679935, diff --git a/project/adl/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj b/project/adl/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj index 8339d434..6691fbc7 100644 --- a/project/adl/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj +++ b/project/adl/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj @@ -1962,7 +1962,7 @@ - + diff --git a/project/adl/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj.filters b/project/adl/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj.filters index b2b8c871..1902fd24 100644 --- a/project/adl/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj.filters +++ b/project/adl/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj.filters @@ -2580,7 +2580,7 @@ ADLplug\sources - + ADLplug\sources diff --git a/project/opn/OPNplug.jucer b/project/opn/OPNplug.jucer index a381b0e6..8cac1535 100644 --- a/project/opn/OPNplug.jucer +++ b/project/opn/OPNplug.jucer @@ -25,7 +25,8 @@ file="../../sources/plugin_processor.cc"/> - + diff --git a/project/opn/juce/Builds/MacOSX/OPNplug.xcodeproj/project.pbxproj b/project/opn/juce/Builds/MacOSX/OPNplug.xcodeproj/project.pbxproj index e1d29d44..4ab8bc5f 100644 --- a/project/opn/juce/Builds/MacOSX/OPNplug.xcodeproj/project.pbxproj +++ b/project/opn/juce/Builds/MacOSX/OPNplug.xcodeproj/project.pbxproj @@ -157,56 +157,57 @@ 4780F7C4BF663A28BFE822B8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "algorithm_component.h"; path = "../../../../../sources/ui/components/algorithm_component.h"; sourceTree = "SOURCE_ROOT"; }; 499D4152A633668F9B43E42B = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Sans-Regular.ttf.gz"; path = "../../../../../resources/ui/fonts/Sans-Regular.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; 4CBF4A4229D83CAF77F73BB9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "rt_checker.cc"; path = "../../../../../sources/utility/rt_checker.cc"; sourceTree = "SOURCE_ROOT"; }; + 4DE5AD038D18B74D184944BB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "plugin_version.h"; path = "../../../../../sources/plugin_version.h"; sourceTree = "SOURCE_ROOT"; }; 4F1C399BB2A3DA9FB801AB7A = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; }; 4F4130D7715BF9BDDAACA1A7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = image.cc; path = ../../../../../sources/ui/utility/image.cc; sourceTree = "SOURCE_ROOT"; }; 50B7419A236577CF0BF7DF4B = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Serif-Italic.ttf.gz"; path = "../../../../../resources/ui/fonts/Serif-Italic.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; - 5168A5F8BA65150C4E77BE80 = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Mono-Bold.ttf.gz"; path = "../../../../../resources/ui/fonts/Mono-Bold.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; 52C1CCB50ECEDA7371BC9156 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "opnmidi_load.cpp"; path = "../../../../../thirdparty/libOPNMIDI/src/opnmidi_load.cpp"; sourceTree = "SOURCE_ROOT"; }; - 556E30B6839750D2E9AD75FF = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Mono-Regular.ttf.gz"; path = "../../../../../resources/ui/fonts/Mono-Regular.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; + 533668A3389E9A0587FA9E69 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "knob_component.cc"; path = "../../../../../sources/ui/components/knob_component.cc"; sourceTree = "SOURCE_ROOT"; }; 55DAC68698963440C17D7639 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "parameter_block.h"; path = "../../../../../sources/opn2/parameter_block.h"; sourceTree = "SOURCE_ROOT"; }; 56B6F0D526579EBE100C46FD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "indicator_NxM.cc"; path = "../../../../../sources/ui/components/indicator_NxM.cc"; sourceTree = "SOURCE_ROOT"; }; + 5860A7F9AD4D15706E2D3FCD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "main_component.cc"; path = "../../../../../sources/opn2/ui/main_component.cc"; sourceTree = "SOURCE_ROOT"; }; + 58A34CA74908FF34441164CF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "instrument_properties.cc"; path = "../../../../../sources/opn2/adl/instrument_properties.cc"; sourceTree = "SOURCE_ROOT"; }; 58BB6179A1ADA743CE1756D8 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 58DD4E6A7392E2E0F6B5E46A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "chip_settings.cc"; path = "../../../../../sources/opn2/adl/chip_settings.cc"; sourceTree = "SOURCE_ROOT"; }; 5CABECC930802C9F125DF1D0 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-VST3.plist"; path = "Info-VST3.plist"; sourceTree = "SOURCE_ROOT"; }; - 602F26CD3502A83C7BC5C91C = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Sans-BoldItalic.ttf.gz"; path = "../../../../../resources/ui/fonts/Sans-BoldItalic.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; 60B1C1590C86BAFFDC923E8F = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - 63A12DA9B20496CE53B56AC1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pak.cc; path = ../../../../../sources/utility/pak.cc; sourceTree = "SOURCE_ROOT"; }; - 6EF286ADA05A483051DC9219 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_processors"; path = "../../../../../thirdparty/JUCE/modules/juce_audio_processors"; sourceTree = "SOURCE_ROOT"; }; - 79699BFC75921B2BD8EFE5C9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; + 6354FD5D5EDF7CE25566DD5C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "algorithm_help.h"; path = "../../../../../sources/opn2/ui/components/algorithm_help.h"; sourceTree = "SOURCE_ROOT"; }; + 6DE5B0661DDE99A2B4317BFC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "main_component.h"; path = "../../../../../sources/ui/main_component.h"; sourceTree = "SOURCE_ROOT"; }; B6C1A70C161F8AE51AF25B08 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OPNplug.dpm; sourceTree = "BUILT_PRODUCTS_DIR"; }; 31B682F29335A0E0B2D5E7EA = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OPNplug.component; sourceTree = "BUILT_PRODUCTS_DIR"; }; 4995D130B7082A7B8A8E2A49 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = messages.h; path = ../../../../../sources/messages.h; sourceTree = "SOURCE_ROOT"; }; + 5168A5F8BA65150C4E77BE80 = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Mono-Bold.ttf.gz"; path = "../../../../../resources/ui/fonts/Mono-Bold.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; 5189F33ED9D651D2CBCA51DB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "parameter_block.h"; path = "../../../../../sources/parameter_block.h"; sourceTree = "SOURCE_ROOT"; }; - 533668A3389E9A0587FA9E69 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "knob_component.cc"; path = "../../../../../sources/ui/components/knob_component.cc"; sourceTree = "SOURCE_ROOT"; }; - 5860A7F9AD4D15706E2D3FCD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "main_component.cc"; path = "../../../../../sources/opn2/ui/main_component.cc"; sourceTree = "SOURCE_ROOT"; }; - 58A34CA74908FF34441164CF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "instrument_properties.cc"; path = "../../../../../sources/opn2/adl/instrument_properties.cc"; sourceTree = "SOURCE_ROOT"; }; - 69359F629354765711B62B71 = {isa = PBXFileReference; lastKnownFileType = file.r; name = "include_juce_audio_plugin_client_RTAS.r"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_RTAS.r"; sourceTree = "SOURCE_ROOT"; }; - 6CCF6B638ECD7B17CFD4E609 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ranges.h; path = ../../../../../thirdparty/fmt/include/fmt/ranges.h; sourceTree = "SOURCE_ROOT"; }; - 6D14D209C6DEEB625E0E709A = {isa = PBXFileReference; lastKnownFileType = image.png; name = "emoji_u1f4c2.png"; path = "../../../../../resources/ui/noto-emoji/emoji_u1f4c2.png"; sourceTree = "SOURCE_ROOT"; }; + 556E30B6839750D2E9AD75FF = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Mono-Regular.ttf.gz"; path = "../../../../../resources/ui/fonts/Mono-Regular.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; + 63A12DA9B20496CE53B56AC1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = pak.cc; path = ../../../../../sources/utility/pak.cc; sourceTree = "SOURCE_ROOT"; }; 723260AF5FA924F63CD59E0F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = "mame_ym2612fm.c"; path = "../../../../../thirdparty/libOPNMIDI/src/chips/mame/mame_ym2612fm.c"; sourceTree = "SOURCE_ROOT"; }; - 7457B25656946FEA29F6886D = {isa = PBXFileReference; lastKnownFileType = image.png; name = "emoji_u1f4be.png"; path = "../../../../../resources/ui/noto-emoji/emoji_u1f4be.png"; sourceTree = "SOURCE_ROOT"; }; - 764182FD5E739A636D11084E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = BinaryData.cpp; path = ../../../JuceLibraryCode/BinaryData.cpp; sourceTree = "SOURCE_ROOT"; }; 89662A4B682CED20B2AAD51F = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = OPNplug.appex; sourceTree = "BUILT_PRODUCTS_DIR"; }; 598DE8B9608A18ED9D0879EB = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OPNplug.app; sourceTree = "BUILT_PRODUCTS_DIR"; }; 5E328B93B15866216B0BFD92 = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOPNplug.a; sourceTree = "BUILT_PRODUCTS_DIR"; }; - 6354FD5D5EDF7CE25566DD5C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "algorithm_help.h"; path = "../../../../../sources/opn2/ui/components/algorithm_help.h"; sourceTree = "SOURCE_ROOT"; }; + 602F26CD3502A83C7BC5C91C = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Sans-BoldItalic.ttf.gz"; path = "../../../../../resources/ui/fonts/Sans-BoldItalic.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; 645306E0190BF2B246376B16 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; }; 6710E33249F63B53B042214C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = player.cc; path = ../../../../../sources/opn2/adl/player.cc; sourceTree = "SOURCE_ROOT"; }; + 69359F629354765711B62B71 = {isa = PBXFileReference; lastKnownFileType = file.r; name = "include_juce_audio_plugin_client_RTAS.r"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_RTAS.r"; sourceTree = "SOURCE_ROOT"; }; 69801E295DD25EEEA9538A0C = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "plugin_editor.h"; path = "../../../../../sources/plugin_editor.h"; sourceTree = "SOURCE_ROOT"; }; 69DCF7A80C66B4C2F43C38DD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "styled_knobs.cc"; path = "../../../../../sources/ui/components/styled_knobs.cc"; sourceTree = "SOURCE_ROOT"; }; - 6DE5B0661DDE99A2B4317BFC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "main_component.h"; path = "../../../../../sources/ui/main_component.h"; sourceTree = "SOURCE_ROOT"; }; + 6CCF6B638ECD7B17CFD4E609 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ranges.h; path = ../../../../../thirdparty/fmt/include/fmt/ranges.h; sourceTree = "SOURCE_ROOT"; }; + 6D14D209C6DEEB625E0E709A = {isa = PBXFileReference; lastKnownFileType = image.png; name = "emoji_u1f4c2.png"; path = "../../../../../resources/ui/noto-emoji/emoji_u1f4c2.png"; sourceTree = "SOURCE_ROOT"; }; 6E283C1D8C5C3449C29776A9 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_formats"; path = "../../../../../thirdparty/JUCE/modules/juce_audio_formats"; sourceTree = "SOURCE_ROOT"; }; 6EC60681F69BD3B84727CE0E = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "knob_component.h"; path = "../../../../../sources/ui/components/knob_component.h"; sourceTree = "SOURCE_ROOT"; }; + 6EF286ADA05A483051DC9219 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_processors"; path = "../../../../../thirdparty/JUCE/modules/juce_audio_processors"; sourceTree = "SOURCE_ROOT"; }; 706268D88D6327B337A4BD09 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = instrument.cc; path = ../../../../../sources/opn2/adl/instrument.cc; sourceTree = "SOURCE_ROOT"; }; 72FCD5D8CBA0C63458D254D9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = ym3438.c; path = ../../../../../thirdparty/libOPNMIDI/src/chips/nuked/ym3438.c; sourceTree = "SOURCE_ROOT"; }; 733566258CE629A286613045 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = instrument.h; path = ../../../../../sources/opn2/adl/instrument.h; sourceTree = "SOURCE_ROOT"; }; + 7457B25656946FEA29F6886D = {isa = PBXFileReference; lastKnownFileType = image.png; name = "emoji_u1f4be.png"; path = "../../../../../resources/ui/noto-emoji/emoji_u1f4be.png"; sourceTree = "SOURCE_ROOT"; }; 75186A344B8335E61B451BBF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "plugin_processor.h"; path = "../../../../../sources/plugin_processor.h"; sourceTree = "SOURCE_ROOT"; }; + 764182FD5E739A636D11084E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = BinaryData.cpp; path = ../../../JuceLibraryCode/BinaryData.cpp; sourceTree = "SOURCE_ROOT"; }; 76B14A63C191BA5C956F8B18 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "dc_filter.h"; path = "../../../../../sources/dsp/dc_filter.h"; sourceTree = "SOURCE_ROOT"; }; 76B87F3CD9DED753ECBBE279 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mamedef.h; path = ../../../../../sources/opn2/adl/measurer/chips/mame/mamedef.h; sourceTree = "SOURCE_ROOT"; }; 76EF6D9BF52D4DE01ADF22CB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_RTAS_4.cpp"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_RTAS_4.cpp"; sourceTree = "SOURCE_ROOT"; }; 76F3C2FFC43C91ACBF0E25B6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = midi.h; path = ../../../../../sources/utility/midi.h; sourceTree = "SOURCE_ROOT"; }; 77A702061C4B79A590360ED4 = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Mono-BoldItalic.ttf.gz"; path = "../../../../../resources/ui/fonts/Mono-BoldItalic.ttf.gz"; sourceTree = "SOURCE_ROOT"; }; 7927F7FB86A5804E6DDE0950 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = waves.h; path = ../../../../../sources/ui/components/waves.h; sourceTree = "SOURCE_ROOT"; }; + 79699BFC75921B2BD8EFE5C9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; 79B5A9FBEB92AF1307600486 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ym3438.h; path = ../../../../../thirdparty/libOPNMIDI/src/chips/nuked/ym3438.h; sourceTree = "SOURCE_ROOT"; }; 7A33D1BA04722C550513810A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "vu_meter.h"; path = "../../../../../sources/ui/components/vu_meter.h"; sourceTree = "SOURCE_ROOT"; }; 7B38221DB7E81B4FCD018648 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "nuked_opn2.h"; path = "../../../../../thirdparty/libOPNMIDI/src/chips/nuked_opn2.h"; sourceTree = "SOURCE_ROOT"; }; @@ -221,7 +222,6 @@ 87212559060E4DF8589511AD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = printf.h; path = ../../../../../thirdparty/fmt/include/fmt/printf.h; sourceTree = "SOURCE_ROOT"; }; 8A46F8FF8245C59B01A91377 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_devices.mm"; path = "../../../JuceLibraryCode/include_juce_audio_devices.mm"; sourceTree = "SOURCE_ROOT"; }; 8ADF6841815023991BFAFECF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "algorithm_component.cc"; path = "../../../../../sources/ui/components/algorithm_component.cc"; sourceTree = "SOURCE_ROOT"; }; - 8D9B99110D1E3C34ABDEBFDC = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../../../../../sources/version.h; sourceTree = "SOURCE_ROOT"; }; 8E00A7AAECFD41B29FB46129 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_utils"; path = "../../../../../thirdparty/JUCE/modules/juce_audio_utils"; sourceTree = "SOURCE_ROOT"; }; 8E69FF0C2C1A9B399C7D1C66 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "knobman_skin.cc"; path = "../../../../../sources/ui/utility/knobman_skin.cc"; sourceTree = "SOURCE_ROOT"; }; 907D7C41E35DB01AA436E95D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_VST2.cpp"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_VST2.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -428,7 +428,7 @@ 69801E295DD25EEEA9538A0C, ACC517C2B8C4F347E6EF835E, 75186A344B8335E61B451BBF, - 8D9B99110D1E3C34ABDEBFDC, + 4DE5AD038D18B74D184944BB, BAAE4D6492B736A0C7A695FB, 982B66D9E9D3B65A925E7997, 0B35D66E96610B76C2679935, diff --git a/project/opn/juce/Builds/VisualStudio2017/OPNplug_SharedCode.vcxproj b/project/opn/juce/Builds/VisualStudio2017/OPNplug_SharedCode.vcxproj index 88a19f4a..ad25f444 100644 --- a/project/opn/juce/Builds/VisualStudio2017/OPNplug_SharedCode.vcxproj +++ b/project/opn/juce/Builds/VisualStudio2017/OPNplug_SharedCode.vcxproj @@ -1962,7 +1962,7 @@ - + diff --git a/project/opn/juce/Builds/VisualStudio2017/OPNplug_SharedCode.vcxproj.filters b/project/opn/juce/Builds/VisualStudio2017/OPNplug_SharedCode.vcxproj.filters index f31934bc..131c1d84 100644 --- a/project/opn/juce/Builds/VisualStudio2017/OPNplug_SharedCode.vcxproj.filters +++ b/project/opn/juce/Builds/VisualStudio2017/OPNplug_SharedCode.vcxproj.filters @@ -2583,7 +2583,7 @@ OPNplug\sources - + OPNplug\sources diff --git a/sources/opl3/ui/about_component.cc b/sources/opl3/ui/about_component.cc index 255f20ac..1d917b29 100644 --- a/sources/opl3/ui/about_component.cc +++ b/sources/opl3/ui/about_component.cc @@ -18,7 +18,7 @@ */ //[Headers] You can add your own extra header files here... -#include "version.h" +#include "plugin_version.h" //[/Headers] #include "about_component.h" diff --git a/sources/opn2/ui/about_component.cc b/sources/opn2/ui/about_component.cc index 2e9f9ae5..03c7c9a1 100644 --- a/sources/opn2/ui/about_component.cc +++ b/sources/opn2/ui/about_component.cc @@ -18,7 +18,7 @@ */ //[Headers] You can add your own extra header files here... -#include "version.h" +#include "plugin_version.h" //[/Headers] #include "about_component.h" diff --git a/sources/version.h b/sources/plugin_version.h similarity index 100% rename from sources/version.h rename to sources/plugin_version.h