zynaddsubfx

ZynAddSubFX open source synthesizer
Log | Files | Refs | Submodules | LICENSE

commit d0d91c4bc4b26ce76b2f26ef1bfede765fac6e2c
parent 58dc57da72fed304127ce3ccb5997bc0c632d8aa
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Sun, 17 Jul 2016 13:47:10 -0400

Fix Name Collision With version.h

Diffstat:
Msrc/CMakeLists.txt | 4++--
Msrc/Misc/XMLwrapper.h | 2+-
Msrc/Plugin/AbstractFX.hpp | 2+-
Msrc/Plugin/ZynAddSubFX/ZynAddSubFX.cpp | 2+-
Msrc/main.cpp | 2+-
Msrc/version.cpp | 2+-
Rsrc/version.h.in -> src/zyn-version.h.in | 0
7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt @@ -362,8 +362,8 @@ endif() # Following this should be only general compilation code, and no mention # of module-specific variables -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in - ${CMAKE_CURRENT_BINARY_DIR}/version.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zyn-version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/zyn-version.h) link_directories(${AUDIO_LIBRARY_DIRS} ${ZLIB_LIBRARY_DIRS} ${FFTW_LIBRARY_DIRS} ${MXML_LIBRARY_DIRS} ${FLTK_LIBRARY_DIRS} ${NTK_LIBRARY_DIRS}) diff --git a/src/Misc/XMLwrapper.h b/src/Misc/XMLwrapper.h @@ -16,7 +16,7 @@ #include <mxml.h> #include <string> #include <vector> -#include "../version.h" +#include "../zyn-version.h" #ifndef XML_WRAPPER_H #define XML_WRAPPER_H diff --git a/src/Plugin/AbstractFX.hpp b/src/Plugin/AbstractFX.hpp @@ -29,7 +29,7 @@ // ZynAddSubFX includes #include "Effects/Effect.h" #include "Misc/Allocator.h" -#include "version.h" +#include "zyn-version.h" /* ------------------------------------------------------------------------------------------------------------ * Abstract plugin class */ diff --git a/src/Plugin/ZynAddSubFX/ZynAddSubFX.cpp b/src/Plugin/ZynAddSubFX/ZynAddSubFX.cpp @@ -15,7 +15,7 @@ #include "DistrhoPlugin.hpp" // ZynAddSubFX includes -#include "version.h" +#include "zyn-version.h" #include "Misc/Master.h" #include "Misc/MiddleWare.h" #include "Misc/Part.h" diff --git a/src/main.cpp b/src/main.cpp @@ -35,7 +35,7 @@ #include "Misc/Master.h" #include "Misc/Part.h" #include "Misc/Util.h" -#include "version.h" +#include "zyn-version.h" //Nio System #include "Nio/Nio.h" diff --git a/src/version.cpp b/src/version.cpp @@ -13,7 +13,7 @@ #include <iostream> -#include "version.h" +#include "zyn-version.h" constexpr int version_type::v_strcmp(const version_type& v2, int i) const { diff --git a/src/version.h.in b/src/zyn-version.h.in