commit 2b1ee9781f43e0bd53a9e05b278dc0da1081af73
parent 1c141dd5d4d1b960391eb567b7a54d4fc5049379
Author: trancy2k5 <63122430+trancy2k5@users.noreply.github.com>
Date: Mon, 24 Jan 2022 11:15:41 +0100
build_win64.bat reset to VS2017 again
Cmake adjustments for both variants
Diffstat:
4 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@ vtune/
/.vs
/out/build/x64-Debug
/temp2/cmake_win64
+/source/jucePlugin_24.01.2022.zip
+/build_win64_VS2019.bat
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,33 +31,33 @@ if(${PROJECT_NAME}_BUILD_JUCEPLUGIN)
if(MSVC OR APPLE)
if(JUCE_GLOBAL_VST2_SDK_PATH)
- install(TARGETS jucePlugin1_VST DESTINATION . COMPONENT VST2)
+ install(TARGETS jucePlugin_VST DESTINATION . COMPONENT VST2)
endif()
- install(TARGETS jucePlugin1_VST3 DESTINATION . COMPONENT VST3)
+ install(TARGETS jucePlugin_VST3 DESTINATION . COMPONENT VST3)
if(APPLE)
- install(TARGETS jucePlugin1_AU DESTINATION . COMPONENT AU)
+ install(TARGETS jucePlugin_AU DESTINATION . COMPONENT AU)
endif()
elseif(UNIX)
if(JUCE_GLOBAL_VST2_SDK_PATH)
- install(TARGETS jucePlugin1_VST LIBRARY DESTINATION /usr/local/lib/lxvst/ COMPONENT VST2)
+ install(TARGETS jucePlugin_VST LIBRARY DESTINATION /usr/local/lib/lxvst/ COMPONENT VST2)
endif()
- install(TARGETS jucePlugin1_VST3 LIBRARY DESTINATION /usr/local/lib/vst3/ COMPONENT VST3)
+ install(TARGETS jucePlugin_VST3 LIBRARY DESTINATION /usr/local/lib/vst3/ COMPONENT VST3)
endif()
endif()
if(MSVC OR APPLE)
if(JUCE_GLOBAL_VST2_SDK_PATH)
- install(TARGETS jucePlugin2_VST DESTINATION . COMPONENT VST2)
+ install(TARGETS jucePlugin_Dark_VST DESTINATION . COMPONENT VST2)
endif()
- install(TARGETS jucePlugin2_VST3 DESTINATION . COMPONENT VST3)
+ install(TARGETS jucePlugin_Dark_VST3 DESTINATION . COMPONENT VST3)
if(APPLE)
- install(TARGETS jucePlugin2_AU DESTINATION . COMPONENT AU)
+ install(TARGETS jucePlugin_Dark_AU DESTINATION . COMPONENT AU)
endif()
elseif(UNIX)
if(JUCE_GLOBAL_VST2_SDK_PATH)
- install(TARGETS jucePlugin2_VST LIBRARY DESTINATION /usr/local/lib/lxvst/ COMPONENT VST2)
+ install(TARGETS jucePlugin_Dark_VST LIBRARY DESTINATION /usr/local/lib/lxvst/ COMPONENT VST2)
endif()
- install(TARGETS jucePlugin2_VST3 LIBRARY DESTINATION /usr/local/lib/vst3/ COMPONENT VST3)
+ install(TARGETS jucePlugin_Dark_VST3 LIBRARY DESTINATION /usr/local/lib/vst3/ COMPONENT VST3)
endif()
# ----------------- Test Console
diff --git a/build_win64.bat b/build_win64.bat
@@ -1,5 +1,5 @@
set outdir=temp\cmake_win64\
-cmake . -B %outdir% -G "Visual Studio 16 2019"
+cmake . -B %outdir% -G "Visual Studio 15 2017 Win64"
IF %ERRORLEVEL% NEQ 0 (
popd
exit /B 2
@@ -12,4 +12,4 @@ IF %ERRORLEVEL% NEQ 0 (
)
cpack -G ZIP
popd
-move /y %outdir%*.zip deploy\
+move /y %outdir%*.zip deploy\
+\ No newline at end of file
diff --git a/source/jucePlugin/CMakeLists.txt b/source/jucePlugin/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.15)
-project(jucePlugin1 VERSION ${CMAKE_PROJECT_VERSION})
+project(jucePlugin VERSION ${CMAKE_PROJECT_VERSION})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)
@@ -10,7 +10,7 @@ else()
set(VST "")
endif()
-juce_add_plugin(jucePlugin1
+juce_add_plugin(jucePlugin
# VERSION ... # Set this if the plugin version is different to the project version
# ICON_BIG ... # ICON_* arguments specify a path to an image file to use as an icon for the Standalone
# ICON_SMALL ...
@@ -25,9 +25,9 @@ juce_add_plugin(jucePlugin1
PLUGIN_CODE TusV # A unique four-character plugin id with exactly one upper-case character
# GarageBand 10.3 requires the first letter to be upper-case, and the remaining letters to be lower-case
FORMATS AU VST3 ${VST} Standalone # The formats to build. Other valid formats are: AAX Unity VST AU AUv3
- PRODUCT_NAME "DSP56300Emu_Skin1" # The name of the final executable, which can differ from the target name
+ PRODUCT_NAME "DSP56300Emu" # The name of the final executable, which can differ from the target name
)
-target_sources(jucePlugin1
+target_sources(jucePlugin
PRIVATE
PluginEditor.cpp
PluginEditor.h
@@ -63,7 +63,7 @@ PRIVATE
# https://forum.juce.com/t/help-needed-using-binarydata-with-cmake-juce-6/40486
# "This might be because the BinaryData files are generated during the build, so the IDE may not be able to find them until the build has been run once (and even then, some IDEs might need a bit of a nudge to re-index the binary directory…)"
-juce_add_binary_data(jucePlugin_BinaryData1
+juce_add_binary_data(jucePlugin_BinaryData
SOURCES
"assets/bg_1377x800.png"
"assets/panels/bg_arp_1018x620.png"
@@ -93,7 +93,7 @@ juce_add_binary_data(jucePlugin_BinaryData1
"assets/knobs/multi_18x18_100.png"
)
-target_compile_definitions(jucePlugin1
+target_compile_definitions(jucePlugin
PUBLIC
# JUCE_WEB_BROWSER and JUCE_USE_CURL would be on by default, but you might not need them.
JUCE_WEB_BROWSER=0 # If you remove this, add `NEEDS_WEB_BROWSER TRUE` to the `juce_add_plugin` call
@@ -102,9 +102,9 @@ PUBLIC
JUCE_WIN_PER_MONITOR_DPI_AWARE=0
)
-target_link_libraries(jucePlugin1
+target_link_libraries(jucePlugin
PRIVATE
- jucePlugin_BinaryData1
+ jucePlugin_BinaryData
juce::juce_audio_utils
juce::juce_cryptography
PUBLIC
@@ -115,7 +115,7 @@ PUBLIC
)
if(UNIX AND NOT APPLE)
- target_link_libraries(jucePlugin1 PUBLIC -static-libgcc -static-libstdc++)
+ target_link_libraries(jucePlugin PUBLIC -static-libgcc -static-libstdc++)
endif()
@@ -123,7 +123,7 @@ endif()
#SKIN2---------------------------------------------------------------------------------------------------------------------------------------
cmake_minimum_required(VERSION 3.15)
-project(jucePlugin2 VERSION ${CMAKE_PROJECT_VERSION})
+project(jucePlugin_Dark VERSION ${CMAKE_PROJECT_VERSION})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)
@@ -133,7 +133,7 @@ else()
set(VST "")
endif()
-juce_add_plugin(jucePlugin2
+juce_add_plugin(jucePlugin_Dark
# VERSION ... # Set this if the plugin version is different to the project version
# ICON_BIG ... # ICON_* arguments specify a path to an image file to use as an icon for the Standalone
# ICON_SMALL ...
@@ -148,9 +148,9 @@ juce_add_plugin(jucePlugin2
PLUGIN_CODE TusV # A unique four-character plugin id with exactly one upper-case character
# GarageBand 10.3 requires the first letter to be upper-case, and the remaining letters to be lower-case
FORMATS AU VST3 ${VST} Standalone # The formats to build. Other valid formats are: AAX Unity VST AU AUv3
- PRODUCT_NAME "DSP56300Emu_Skin2" # The name of the final executable, which can differ from the target name
+ PRODUCT_NAME "DSP56300Emu_Dark" # The name of the final executable, which can differ from the target name
)
-target_sources(jucePlugin2
+target_sources(jucePlugin_Dark
PRIVATE
PluginEditorSkin2.cpp
PluginEditorSkin2.h
@@ -184,7 +184,7 @@ PRIVATE
# https://forum.juce.com/t/help-needed-using-binarydata-with-cmake-juce-6/40486
# "This might be because the BinaryData files are generated during the build, so the IDE may not be able to find them until the build has been run once (and even then, some IDEs might need a bit of a nudge to re-index the binary directory…)"
-juce_add_binary_data(jucePlugin_BinaryData2
+juce_add_binary_data(jucePlugin_BinaryData_Dark
SOURCES
"assets2/main_background.png"
"assets2/panels/panel_1.png"
@@ -214,7 +214,7 @@ juce_add_binary_data(jucePlugin_BinaryData2
"assets2/font/Digital"
)
-target_compile_definitions(jucePlugin2
+target_compile_definitions(jucePlugin_Dark
PUBLIC
# JUCE_WEB_BROWSER and JUCE_USE_CURL would be on by default, but you might not need them.
JUCE_WEB_BROWSER=0 # If you remove this, add `NEEDS_WEB_BROWSER TRUE` to the `juce_add_plugin` call
@@ -223,9 +223,9 @@ PUBLIC
JUCE_WIN_PER_MONITOR_DPI_AWARE=0
)
-target_link_libraries(jucePlugin2
+target_link_libraries(jucePlugin_Dark
PRIVATE
- jucePlugin_BinaryData2
+ jucePlugin_BinaryData_Dark
juce::juce_audio_utils
juce::juce_cryptography
PUBLIC
@@ -236,5 +236,5 @@ PUBLIC
)
if(UNIX AND NOT APPLE)
- target_link_libraries(jucePlugin2 PUBLIC -static-libgcc -static-libstdc++)
+ target_link_libraries(jucePlugin_Dark PUBLIC -static-libgcc -static-libstdc++)
endif()
\ No newline at end of file
