rename version.h because of potential name conflicts

jpcima · Sep 15, 2018 · 65d98d1 · 65d98d1
1 parent d5d74f0
commit 65d98d1
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 30 deletions.
diff --git a/project/adl/ADLplug.jucer b/project/adl/ADLplug.jucer
@@ -25,7 +25,8 @@
             file="../../sources/plugin_processor.cc"/>
       <FILE id="QkXWb6" name="plugin_processor.h" compile="0" resource="0"
             file="../../sources/plugin_processor.h"/>
-      <FILE id="OwCQmr" name="version.h" compile="0" resource="0" file="../../sources/version.h"/>
+      <FILE id="CDfB1P" name="plugin_version.h" compile="0" resource="0"
+            file="../../sources/plugin_version.h"/>
       <FILE id="M4xlwY" name="worker.cc" compile="1" resource="0" file="../../sources/worker.cc"/>
       <FILE id="ymYAK6" name="worker.h" compile="0" resource="0" file="../../sources/worker.h"/>
       <GROUP id="{90BE611D-B377-7C79-171F-98F2CD7899AE}" name="adl">

diff --git 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,20 +183,19 @@
 		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"; };
 		89662A4B682CED20B2AAD51F = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ADLplug.appex; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		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
@@ -1962,7 +1962,7 @@
     <ClInclude Include="..\..\..\..\..\sources\parameter_block.h"/>
     <ClInclude Include="..\..\..\..\..\sources\plugin_editor.h"/>
     <ClInclude Include="..\..\..\..\..\sources\plugin_processor.h"/>
-    <ClInclude Include="..\..\..\..\..\sources\version.h"/>
+    <ClInclude Include="..\..\..\..\..\sources\plugin_version.h"/>
     <ClInclude Include="..\..\..\..\..\sources\worker.h"/>
     <ClInclude Include="..\..\..\..\..\sources\adl\chip_settings.h"/>
     <ClInclude Include="..\..\..\..\..\sources\adl\instrument.h"/>

diff --git a/project/adl/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj.filters b/project/adl/juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj.filters
@@ -2580,7 +2580,7 @@
     <ClInclude Include="..\..\..\..\..\sources\plugin_processor.h">
       <Filter>ADLplug\sources</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\..\sources\version.h">
+    <ClInclude Include="..\..\..\..\..\sources\plugin_version.h">
       <Filter>ADLplug\sources</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\..\sources\worker.h">

diff --git a/project/opn/OPNplug.jucer b/project/opn/OPNplug.jucer
@@ -25,7 +25,8 @@
             file="../../sources/plugin_processor.cc"/>
       <FILE id="QkXWb6" name="plugin_processor.h" compile="0" resource="0"
             file="../../sources/plugin_processor.h"/>
-      <FILE id="OwCQmr" name="version.h" compile="0" resource="0" file="../../sources/version.h"/>
+      <FILE id="J0Jzyn" name="plugin_version.h" compile="0" resource="0"
+            file="../../sources/plugin_version.h"/>
       <FILE id="M4xlwY" name="worker.cc" compile="1" resource="0" file="../../sources/worker.cc"/>
       <FILE id="ymYAK6" name="worker.h" compile="0" resource="0" file="../../sources/worker.h"/>
       <GROUP id="{90BE611D-B377-7C79-171F-98F2CD7899AE}" name="adl">