Commit e1b942f5 authored by Andreas Bombe's avatar Andreas Bombe

Refresh patches

parent 4eb9dc06
......@@ -4,12 +4,22 @@ Author: Andreas Bombe <aeb@debian.org>
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -944,8 +944,6 @@
@@ -988,9 +988,6 @@
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro")
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/external/deb/deb_post.sh.in"
- "${CMAKE_CURRENT_BINARY_DIR}/deb_post.sh" @ONLY IMMEDIATE)
-
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/CubicSDR.desktop.in"
"${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.desktop" @ONLY IMMEDIATE)
@@ -1042,8 +1039,6 @@
INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/CubicSDR.desktop"
DESTINATION share/applications)
DESTINATION share/applications)
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/external/deb/deb_post.sh.in"
- "${CMAKE_CURRENT_BINARY_DIR}/deb_post.sh" @ONLY IMMEDIATE)
- "${CMAKE_CURRENT_BINARY_DIR}/deb_post.sh" @ONLY IMMEDIATE)
CONFIGURE_FILE(
"${PROJECT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
......@@ -6,34 +6,35 @@ Author: Andreas Bombe <aeb@debian.org>
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,6 +126,10 @@
include_directories(${RTAUDIO_INCLUDE_DIRS})
SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${RTAUDIO_LIBRARIES})
@@ -137,6 +137,11 @@
SET( EX_PLATFORM_NAME "x86" )
endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(TIXML REQUIRED tinyxml)
+include_directories(${TIXML_INCLUDE_DIRS})
+SET(OTHER_LIBRARIES ${OTHER_LIBRARIES} ${TIXML_LIBRARIES})
+
find_package(wxWidgets COMPONENTS gl core propgrid adv base REQUIRED)
set(wxWidgets_CONFIGURATION mswu)
@@ -312,10 +316,6 @@
src/forms/SDRDevices/SDRDeviceAdd.cpp
src/forms/SDRDevices/SDRDeviceAddForm.cpp
external/lodepng/lodepng.cpp
- external/tinyxml/tinyxml.cpp
- external/tinyxml/tinystr.cpp
- external/tinyxml/tinyxmlparser.cpp
- external/tinyxml/tinyxmlerror.cpp
external/cubicvr2/math/cubic_math.cpp
SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME})
SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PROJECT_BINARY_DIR}/${EX_PLATFORM_NAME})
@@ -379,10 +384,6 @@
src/forms/Dialog/AboutDialogBase.cpp
src/forms/Dialog/AboutDialog.cpp
external/lodepng/lodepng.cpp
- external/tinyxml/tinyxml.cpp
- external/tinyxml/tinystr.cpp
- external/tinyxml/tinyxmlparser.cpp
- external/tinyxml/tinyxmlerror.cpp
external/cubicvr2/math/cubic_math.cpp
)
@@ -415,8 +415,6 @@
src/forms/SDRDevices/SDRDeviceAdd.h
src/forms/SDRDevices/SDRDeviceAddForm.h
external/lodepng/lodepng.h
- external/tinyxml/tinyxml.h
- external/tinyxml/tinystr.h
external/cubicvr2/math/aabb.h
external/cubicvr2/math/cubic_math.h
external/cubicvr2/math/cubic_types.h
@@ -486,8 +487,6 @@
src/forms/Dialog/AboutDialogBase.h
src/forms/Dialog/AboutDialog.h
external/lodepng/lodepng.h
- external/tinyxml/tinyxml.h
- external/tinyxml/tinystr.h
external/cubicvr2/math/aabb.h
external/cubicvr2/math/cubic_math.h
external/cubicvr2/math/cubic_types.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment