Skip to content

Commit

Permalink
prepare for alpha release
Browse files Browse the repository at this point in the history
  • Loading branch information
jpcima committed Jul 26, 2018
1 parent 92060aa commit a9d3ea9
Show file tree
Hide file tree
Showing 10 changed files with 97 additions and 40 deletions.
3 changes: 2 additions & 1 deletion ADLplug.jucer
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
pluginManufacturer="jpcima" pluginManufacturerCode="JPCm" pluginCode="ADLM"
aaxIdentifier="jpcima.ADLplug" headerPath="../../../sources
../../../thirdparty/libADLMIDI/include
../../../thirdparty/wopl"
defines="ADLMIDI_UNSTABLE_API
ADLMIDI_DISABLE_CPP_EXTRAS
ADLMIDI_DISABLE_MIDI_SEQUENCER
ADLMIDI_DISABLE_MUS_SUPPORT
ADLMIDI_DISABLE_XMI_SUPPORT"
id="ojbkOL">
id="ojbkOL" version="1.0.0">
<MAINGROUP id="faq0v0" name="ADLplug">
<GROUP id="{57FD1426-D8BF-7CCC-6B25-2A7108A4390B}" name="sources">
<FILE id="dneZUm" name="bank_manager.cc" compile="1" resource="0" file="sources/bank_manager.cc"/>
Expand All @@ -23,6 +23,7 @@
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="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">
Expand Down
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

project(ADLplug VERSION 1.0.0 LANGUAGES CXX C)
project(ADLplug VERSION "1.0.0" LANGUAGES CXX C)
set(ADLplug_URI "https://github.com/jpcima/ADLplug")

include(SystemOption)
Expand Down Expand Up @@ -127,21 +127,27 @@ endif()
macro(add_plugin NAME)
add_library("${NAME}" MODULE "sources/nothing.cc" ${ARGN})
set_property(TARGET "${NAME}" PROPERTY PREFIX "")
static_link_mingw_crt("${NAME}")
if(ADLplug_RT_CHECKER)
set_property(TARGET "${NAME}" APPEND_STRING
PROPERTY LINK_FLAGS " ${ADLplug_RT_CHECKER_LINK_FLAGS}")
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
target_sources("${NAME}" PRIVATE "${PROJECT_SOURCE_DIR}/juce/Builds/VisualStudio2017/resources.rc")
endif()
static_link_mingw_crt("${NAME}")
endmacro()

macro(add_standalone NAME)
add_executable("${NAME}" "sources/nothing.cc" ${ARGN})
set_property(TARGET "${NAME}" PROPERTY PREFIX "")
static_link_mingw_crt("${NAME}")
if(ADLplug_RT_CHECKER)
set_property(TARGET "${NAME}" APPEND_STRING
PROPERTY LINK_FLAGS " ${ADLplug_RT_CHECKER_LINK_FLAGS}")
endif()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
target_sources("${NAME}" PRIVATE "${PROJECT_SOURCE_DIR}/juce/Builds/VisualStudio2017/resources.rc")
endif()
static_link_mingw_crt("${NAME}")
endmacro()

if(ADLplug_VST2)
Expand Down
4 changes: 2 additions & 2 deletions JUCE-targets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ else()
target_link_libraries(juce_gui_basics PUBLIC juce_gui_extra)
endif()

find_package(Threads REQUIRED)
target_link_libraries(juce_core PRIVATE ${CMAKE_THREAD_LIBS_INIT})
include(LinkHelpers)
target_link_static_threads(juce_core)

add_library(vst3sdk INTERFACE)
target_include_directories(vst3sdk INTERFACE "${PROJECT_SOURCE_DIR}/thirdparty/vst3sdk")
Expand Down
13 changes: 10 additions & 3 deletions cmake/LinkHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,15 @@ macro(static_link_mingw_crt TARGET)
# forces the static link of standard libraries
set_property(TARGET "${TARGET}" APPEND_STRING
PROPERTY LINK_FLAGS " -static-libgcc -static-libstdc++")
# forces the static link of winpthread
set_property(TARGET "${TARGET}" APPEND_STRING
PROPERTY LINK_FLAGS " -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,-Bdynamic,--no-whole-archive")
endif()
endmacro()

macro(target_link_static_threads TARGET)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND MINGW)
# use a statically link winpthread
target_link_libraries("${TARGET}" PRIVATE "-Wl,-Bstatic -lwinpthread -Wl,-Bdynamic")
else()
find_package(Threads REQUIRED)
target_link_libraries("${TARGET}" PRIVATE ${CMAKE_THREAD_LIBS_INIT})
endif()
endmacro()
32 changes: 17 additions & 15 deletions juce/Builds/MacOSX/ADLplug.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -163,40 +163,40 @@
5BB2AE5D1FB4F040330B6EC2 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "parameter_block.h"; path = "../../../sources/parameter_block.h"; sourceTree = "SOURCE_ROOT"; };
5C246166132206B9BF8CBDC4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "dc_filter.h"; path = "../../../sources/dsp/dc_filter.h"; sourceTree = "SOURCE_ROOT"; };
5CABECC930802C9F125DF1D0 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-VST3.plist"; path = "Info-VST3.plist"; sourceTree = "SOURCE_ROOT"; };
5D1B8950EBF39EF8C7332EAA = {isa = PBXFileReference; lastKnownFileType = file.tcc; name = "opl_chip_base.tcc"; path = "../../../sources/adl/measurer/chips/opl_chip_base.tcc"; sourceTree = "SOURCE_ROOT"; };
5E70EFC1C920B93AC8513BD9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "simple_fifo.h"; path = "../../../sources/utility/simple_fifo.h"; sourceTree = "SOURCE_ROOT"; };
60B1C1590C86BAFFDC923E8F = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
626FBBA05566ECAB81E995CD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "knobman_skin.h"; path = "../../../sources/ui/utility/knobman_skin.h"; sourceTree = "SOURCE_ROOT"; };
64AA7EC2FFADFC46E27EF10B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "adlmidi_private.hpp"; path = "../../../thirdparty/libADLMIDI/src/adlmidi_private.hpp"; sourceTree = "SOURCE_ROOT"; };
66AF8028933F44CC92A4D26D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = nukedopl3.c; path = ../../../thirdparty/libADLMIDI/src/chips/nuked/nukedopl3.c; 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"; };
6A0CECF8DCB3F1D25C21DA14 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_formats"; path = "../../../thirdparty/JUCE/modules/juce_audio_formats"; sourceTree = "SOURCE_ROOT"; };
6C79336553291299BAC6376F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = fraction.hpp; path = ../../../thirdparty/libADLMIDI/src/fraction.hpp; sourceTree = "SOURCE_ROOT"; };
6CA2BE713668319543E11354 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "vu_meter.h"; path = "../../../sources/ui/components/vu_meter.h"; sourceTree = "SOURCE_ROOT"; };
74EAF8FFD08C2DFA2CBD93F2 = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Serif-BoldItalic.ttf.gz"; path = "../../../resources/ui/fonts/Serif-BoldItalic.ttf.gz"; sourceTree = "SOURCE_ROOT"; };
764182FD5E739A636D11084E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = BinaryData.cpp; path = ../../../JuceLibraryCode/BinaryData.cpp; sourceTree = "SOURCE_ROOT"; };
769721BCA66B96F37BD78071 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_extra"; path = "../../../thirdparty/JUCE/modules/juce_gui_extra"; 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"; };
76618899E5BC2F7A8EF60BA5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = midi.cc; path = ../../../sources/utility/midi.cc; sourceTree = "SOURCE_ROOT"; };
774A3345D14799F3764F9822 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "nuked_opl3.cpp"; path = "../../../thirdparty/libADLMIDI/src/chips/nuked_opl3.cpp"; 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"; };
7C91BAB6C5FCBBB33AA567D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_utils.mm"; path = "../../../JuceLibraryCode/include_juce_audio_utils.mm"; sourceTree = "SOURCE_ROOT"; };
80E226846A91539090948A50 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_AUv3.mm"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_AUv3.mm"; sourceTree = "SOURCE_ROOT"; };
832902B433C17B378D0E67A5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "dosbox_opl3.cpp"; path = "../../../thirdparty/libADLMIDI/src/chips/dosbox_opl3.cpp"; sourceTree = "SOURCE_ROOT"; };
785107ECD8F425460721EB14 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "wave_label.cc"; path = "../../../sources/ui/components/wave_label.cc"; 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"; };
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"; };
5D1B8950EBF39EF8C7332EAA = {isa = PBXFileReference; lastKnownFileType = file.tcc; name = "opl_chip_base.tcc"; path = "../../../sources/adl/measurer/chips/opl_chip_base.tcc"; sourceTree = "SOURCE_ROOT"; };
5D9220D22C034C44560E6CA4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = definitions.h; path = ../../../sources/definitions.h; sourceTree = "SOURCE_ROOT"; };
5E328B93B15866216B0BFD92 = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libADLplug.a; sourceTree = "BUILT_PRODUCTS_DIR"; };
626FBBA05566ECAB81E995CD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "knobman_skin.h"; path = "../../../sources/ui/utility/knobman_skin.h"; sourceTree = "SOURCE_ROOT"; };
645306E0190BF2B246376B16 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; };
64AA7EC2FFADFC46E27EF10B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "adlmidi_private.hpp"; path = "../../../thirdparty/libADLMIDI/src/adlmidi_private.hpp"; sourceTree = "SOURCE_ROOT"; };
66AF8028933F44CC92A4D26D = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = nukedopl3.c; path = ../../../thirdparty/libADLMIDI/src/chips/nuked/nukedopl3.c; sourceTree = "SOURCE_ROOT"; };
6C79336553291299BAC6376F = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = fraction.hpp; path = ../../../thirdparty/libADLMIDI/src/fraction.hpp; sourceTree = "SOURCE_ROOT"; };
6CA2BE713668319543E11354 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "vu_meter.h"; path = "../../../sources/ui/components/vu_meter.h"; sourceTree = "SOURCE_ROOT"; };
6CEF9F4091C10C66DC5C24D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = worker.cc; path = ../../../sources/worker.cc; sourceTree = "SOURCE_ROOT"; };
73B5ECCC67A9A6EAA842576E = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Mono-Italic.ttf.gz"; path = "../../../resources/ui/fonts/Mono-Italic.ttf.gz"; sourceTree = "SOURCE_ROOT"; };
74EAF8FFD08C2DFA2CBD93F2 = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Serif-BoldItalic.ttf.gz"; path = "../../../resources/ui/fonts/Serif-BoldItalic.ttf.gz"; sourceTree = "SOURCE_ROOT"; };
76618899E5BC2F7A8EF60BA5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = midi.cc; path = ../../../sources/utility/midi.cc; sourceTree = "SOURCE_ROOT"; };
769721BCA66B96F37BD78071 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_extra"; path = "../../../thirdparty/JUCE/modules/juce_gui_extra"; 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"; };
78368434ED0EE139AE38B2F9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "adlmidi_load.cpp"; path = "../../../thirdparty/libADLMIDI/src/adlmidi_load.cpp"; sourceTree = "SOURCE_ROOT"; };
785107ECD8F425460721EB14 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "wave_label.cc"; path = "../../../sources/ui/components/wave_label.cc"; 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"; };
7C91BAB6C5FCBBB33AA567D8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_utils.mm"; path = "../../../JuceLibraryCode/include_juce_audio_utils.mm"; sourceTree = "SOURCE_ROOT"; };
7DF6FB906BFD6A709AEA3CAD = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-AU.plist"; path = "Info-AU.plist"; sourceTree = "SOURCE_ROOT"; };
7EDA9FB1D2D65D1CDBE704CA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "main_component.cc"; path = "../../../sources/ui/main_component.cc"; sourceTree = "SOURCE_ROOT"; };
80E226846A91539090948A50 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_AUv3.mm"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_AUv3.mm"; sourceTree = "SOURCE_ROOT"; };
8281F591131DCE58CE9D13E5 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
832902B433C17B378D0E67A5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "dosbox_opl3.cpp"; path = "../../../thirdparty/libADLMIDI/src/chips/dosbox_opl3.cpp"; sourceTree = "SOURCE_ROOT"; };
84FC28852A18BC11523E3626 = {isa = PBXFileReference; lastKnownFileType = file.gz; name = "Sans-Regular.ttf.gz"; path = "../../../resources/ui/fonts/Sans-Regular.ttf.gz"; sourceTree = "SOURCE_ROOT"; };
853FA5EE3F9D20920C71D934 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_AAX.mm"; path = "../../../JuceLibraryCode/include_juce_audio_plugin_client_AAX.mm"; sourceTree = "SOURCE_ROOT"; };
85ED2DFBD36E7206DA368CAC = {isa = PBXFileReference; lastKnownFileType = file.tcc; name = "counting_bitset.tcc"; path = "../../../sources/utility/counting_bitset.tcc"; sourceTree = "SOURCE_ROOT"; };
Expand Down Expand Up @@ -266,6 +266,7 @@
CBA61A9A193DFB7F4CD693C3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "midi_sequencer_impl.hpp"; path = "../../../thirdparty/libADLMIDI/src/midi_sequencer_impl.hpp"; sourceTree = "SOURCE_ROOT"; };
CCEBA28EF61511C5A3170AD7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = worker.h; path = ../../../sources/worker.h; sourceTree = "SOURCE_ROOT"; };
CD8DD4994376E5A96AE0B3EB = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "cvt_xmi2mid.hpp"; path = "../../../thirdparty/libADLMIDI/src/cvt_xmi2mid.hpp"; sourceTree = "SOURCE_ROOT"; };
D0EF3D715380CF0B3C0F5517 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../../../sources/version.h; sourceTree = "SOURCE_ROOT"; };
D1AB37DBAAE7C4341688B630 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "opl3_waves.h"; path = "../../../sources/ui/chips/opl3_waves.h"; sourceTree = "SOURCE_ROOT"; };
D259B3629D1EF1B3BD499FD2 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
D2897E988363DFCBED43E130 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; };
Expand Down Expand Up @@ -385,6 +386,7 @@
98DD4844FED4BCD7E03543F2,
A5BC03C97A3AF9EA35828D1D,
25E0015B78216CD8D06CB533,
D0EF3D715380CF0B3C0F5517,
6CEF9F4091C10C66DC5C24D8,
CCEBA28EF61511C5A3170AD7,
0B35D66E96610B76C2679935,
Expand Down
1 change: 1 addition & 0 deletions juce/Builds/VisualStudio2017/ADLplug_SharedCode.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1942,6 +1942,7 @@
<ClInclude Include="..\..\..\sources\messages.h"/>
<ClInclude Include="..\..\..\sources\plugin_editor.h"/>
<ClInclude Include="..\..\..\sources\plugin_processor.h"/>
<ClInclude Include="..\..\..\sources\version.h"/>
<ClInclude Include="..\..\..\sources\worker.h"/>
<ClInclude Include="..\..\..\sources\adl\instrument.h"/>
<ClInclude Include="..\..\..\sources\adl\player.h"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2523,6 +2523,9 @@
<ClInclude Include="..\..\..\sources\plugin_processor.h">
<Filter>ADLplug\sources</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\version.h">
<Filter>ADLplug\sources</Filter>
</ClInclude>
<ClInclude Include="..\..\..\sources\worker.h">
<Filter>ADLplug\sources</Filter>
</ClInclude>
Expand Down
Loading

0 comments on commit a9d3ea9

Please sign in to comment.