From eefa59917d59b27e93e4f7c3dd619c67acfab6fc Mon Sep 17 00:00:00 2001
From: "Charles J. Cliffe" <cj@cubicproductions.com>
Date: Mon, 9 Nov 2015 22:05:12 -0500
Subject: [PATCH] Fixes for MSVC build

---
 CMakeLists.txt                 | 27 ++++++++++++++-------------
 cmake/Modules/FindFFTW.cmake   |  2 +-
 cmake/Modules/FindLiquid.cmake |  4 ++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5573f0a..260895c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,19 @@ SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME})
 SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME})
 SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME})
 
+IF (MSVC) 
+	include_directories ("${PROJECT_SOURCE_DIR}/external/wglext")
+	SET(FFTW_INCLUDES "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/")
+	SET(FFTW_LIBRARIES "${PROJECT_SOURCE_DIR}/external/fftw-3.3.4/${EX_PLATFORM}/libfftw3f-3.lib")
+	SET(LIQUID_INCLUDES "${PROJECT_SOURCE_DIR}/external/liquid-dsp/include/")
+	SET(LIQUID_LIBRARIES "${PROJECT_SOURCE_DIR}/external/liquid-dsp/msvc/${EX_PLATFORM}/libliquid.lib")
+ELSE (MSVC)
+	ADD_DEFINITIONS(
+		-std=c++0x 
+		-pthread
+	)
+ENDIF(MSVC)
+
 find_package(OpenGL REQUIRED)
 #IF (NOT WIN32)
 find_package(FFTW REQUIRED)
@@ -77,7 +90,7 @@ include_directories(${LIQUID_INCLUDES} ${FFTW_INCLUDES})
 SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${LIQUID_LIBRARIES} ${FFTW_LIBRARIES})
 #ENDIF()
 
-find_package(wxWidgets COMPONENTS gl core propgrid base REQUIRED)
+find_package(wxWidgets COMPONENTS gl core propgrid adv base REQUIRED)
 set(wxWidgets_CONFIGURATION mswu)
 include(${wxWidgets_USE_FILE})
 
@@ -364,18 +377,6 @@ include_directories (
 	${PROJECT_SOURCE_DIR}/external/cubicvr2/math
 )
 
-IF (MSVC) 
-include_directories (
-	${PROJECT_SOURCE_DIR}/external/wglext
-)
-
-ELSE (MSVC)
-	ADD_DEFINITIONS(
-		-std=c++0x 
-		-pthread
-	)
-ENDIF(MSVC)
-
 set(RES_FILES "")
 if(MINGW OR MSVC)
  set(RES_FILES ${PROJECT_SOURCE_DIR}/cubicsdr.rc)
diff --git a/cmake/Modules/FindFFTW.cmake b/cmake/Modules/FindFFTW.cmake
index 00c3401..0a4c607 100644
--- a/cmake/Modules/FindFFTW.cmake
+++ b/cmake/Modules/FindFFTW.cmake
@@ -19,4 +19,4 @@ find_library (FFTW_LIBRARIES NAMES fftw3)
 include (FindPackageHandleStandardArgs)
 find_package_handle_standard_args (FFTW DEFAULT_MSG FFTW_LIBRARIES FFTW_INCLUDES)
 
-mark_as_advanced (FFTW_LIBRARIES FFTW_INCLUDES)
+#mark_as_advanced (FFTW_LIBRARIES FFTW_INCLUDES)
diff --git a/cmake/Modules/FindLiquid.cmake b/cmake/Modules/FindLiquid.cmake
index f6f2d24..5ce9d0d 100644
--- a/cmake/Modules/FindLiquid.cmake
+++ b/cmake/Modules/FindLiquid.cmake
@@ -1,7 +1,7 @@
 # - Find LIQUID
 # Find the native LIQUID includes and library
 #
-#  LIQUID_INCLUDES    - where to find LIQUID3.h
+#  LIQUID_INCLUDES    - where to find LIQUID.h
 #  LIQUID_LIBRARIES   - List of libraries when using LIQUID.
 #  LIQUID_FOUND       - True if LIQUID found.
 
@@ -19,4 +19,4 @@ find_library (LIQUID_LIBRARIES NAMES liquid)
 include (FindPackageHandleStandardArgs)
 find_package_handle_standard_args (LIQUID DEFAULT_MSG LIQUID_LIBRARIES LIQUID_INCLUDES)
 
-mark_as_advanced (LIQUID_LIBRARIES LIQUID_INCLUDES)
+#mark_as_advanced (LIQUID_LIBRARIES LIQUID_INCLUDES)