mirror of
https://github.com/cjcliffe/CubicSDR.git
synced 2025-04-04 18:48:38 -04:00
Fixes for MSVC build
This commit is contained in:
parent
23acca93c7
commit
eefa59917d
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user