From f1c580a7c22471afb1b40191f4b0128712c5d8f5 Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Sep 2019 15:45:25 +0200 Subject: [PATCH 1/3] remove not needed FindDirectX.cmake --- FindDirectX.cmake | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 FindDirectX.cmake diff --git a/FindDirectX.cmake b/FindDirectX.cmake deleted file mode 100644 index 342e5f7..0000000 --- a/FindDirectX.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# - Try to find DirectX SDK -# Once done this will define -# -# DIRECTX_FOUND - system has DirectX SDK -# DIRECTX_INCLUDE_DIR - the DirectX include directories -# DIRECTX_LIBRARIES - Link these to use DirectX SDK -# DIRECTX_D3D9_LIBRARY - Link this to use D3D9 -# DIRECTX_D3DX9_LIBRARY - Link this to use D3DX9 - -FIND_PATH(DIRECTX_INCLUDE_DIR d3d9.h PATHS - "$ENV{DXSDK_DIR}Include" - "$ENV{PROGRAMFILES}/Microsoft DirectX SDK*/Include" - "C:/apps_x86/Microsoft DirectX SDK*/Include" - "C:/apps/Microsoft DirectX SDK*/Include" - "C:/Program Files (x86)/Microsoft DirectX SDK*/Include" - "C:/Program Files/Microsoft DirectX SDK*/Include" - NO_DEFAULT_PATH -) -FIND_PATH(DIRECTX_INCLUDE_DIR d3d9.h) -GET_FILENAME_COMPONENT(DIRECTX_ROOT_DIR "${DIRECTX_INCLUDE_DIR}/.." ABSOLUTE) - -IF(CMAKE_CL_64) - SET(DIRECTX_LIBRARY_PATHS "${DIRECTX_ROOT_DIR}/Lib/x64") -ELSE() - SET(DIRECTX_LIBRARY_PATHS "${DIRECTX_ROOT_DIR}/Lib/x86" "${DIRECTX_ROOT_DIR}/Lib") -ENDIF() - -FIND_LIBRARY(DIRECTX_D3D9_LIBRARY d3d9 ${DIRECTX_LIBRARY_PATHS} NO_DEFAULT_PATH) -FIND_LIBRARY(DIRECTX_D3DX9_LIBRARY d3dx9 ${DIRECTX_LIBRARY_PATHS} NO_DEFAULT_PATH) -SET(DIRECTX_LIBRARIES ${DIRECTX_D3D9_LIBRARY} ${DIRECTX_D3DX9_LIBRARY}) - -# handle the QUIETLY and REQUIRED arguments and set DIRECTX_FOUND to TRUE if all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(DIRECTX DEFAULT_MSG DIRECTX_ROOT_DIR DIRECTX_LIBRARIES DIRECTX_INCLUDE_DIR) -MARK_AS_ADVANCED( - DIRECTX_INCLUDE_DIR - DIRECTX_D3D9_LIBRARY - DIRECTX_D3DX9_LIBRARY -) \ No newline at end of file From 28f0e2903b602e61c969da928099ccd735ac258b Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Sep 2019 15:47:20 +0200 Subject: [PATCH 2/3] remove not needed virtual from DX source --- src/Main_dx.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Main_dx.cpp b/src/Main_dx.cpp index 4fceb26..176e22f 100644 --- a/src/Main_dx.cpp +++ b/src/Main_dx.cpp @@ -57,11 +57,11 @@ class CVisualizationWaveForm { public: CVisualizationWaveForm(); - virtual ~CVisualizationWaveForm(); + ~CVisualizationWaveForm() override; - virtual ADDON_STATUS Create() override; - virtual void Render() override; - virtual void AudioData(const float* audioData, int audioDataLength, float *freqData, int freqDataLength) override; + ADDON_STATUS Create() override; + void Render() override; + void AudioData(const float* audioData, int audioDataLength, float *freqData, int freqDataLength) override; private: bool init_renderer_objs(); From 7ac13c42ba67c742f826efd14b179ae4f3ed87bb Mon Sep 17 00:00:00 2001 From: Alwin Esch Date: Wed, 25 Sep 2019 15:53:55 +0200 Subject: [PATCH 3/3] increase version to 4.0.1 --- visualization.waveform/addon.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/visualization.waveform/addon.xml.in b/visualization.waveform/addon.xml.in index ddc2a7f..07b94a6 100644 --- a/visualization.waveform/addon.xml.in +++ b/visualization.waveform/addon.xml.in @@ -1,7 +1,7 @@  @ADDON_DEPENDS@