|
 |
c340216 |
From 5e1200b3da4f8497f302d3c8c20d784929a18c58 Mon Sep 17 00:00:00 2001
|
|
|
b11d89a |
From: Fabrice Bellet <fabrice@bellet.info>
|
|
|
dbe9423 |
Date: Tue, 17 Feb 2015 20:14:04 +0100
|
|
|
1fc7f65 |
Subject: [PATCH] use system iaxclient instead of bundled one
|
|
|
ef5c24b |
|
|
|
ef5c24b |
---
|
|
|
58f8c2b |
3rdparty/CMakeLists.txt | 4 ----
|
|
|
58f8c2b |
CMakeLists.txt | 1 -
|
|
|
58f8c2b |
CMakeModules/SetupFGFSLibraries.cmake | 2 +-
|
|
|
58f8c2b |
src/Network/fgcom.cxx | 2 +-
|
|
|
58f8c2b |
utils/fgcom/CMakeLists.txt | 2 +-
|
|
|
58f8c2b |
utils/fgcom/fgcom.cxx | 2 +-
|
|
|
dbe9423 |
6 files changed, 4 insertions(+), 9 deletions(-)
|
|
|
ef5c24b |
|
|
|
b11d89a |
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
|
|
|
715a22b |
index f8654d336..30169146c 100644
|
|
|
b11d89a |
--- a/3rdparty/CMakeLists.txt
|
|
|
b11d89a |
+++ b/3rdparty/CMakeLists.txt
|
|
|
b11d89a |
@@ -3,10 +3,6 @@ if (NOT SYSTEM_SQLITE)
|
|
|
b11d89a |
add_subdirectory(sqlite3)
|
|
|
b11d89a |
endif()
|
|
|
b11d89a |
|
|
|
b11d89a |
-if (ENABLE_IAX)
|
|
|
b11d89a |
- add_subdirectory(iaxclient/lib)
|
|
|
b11d89a |
-endif()
|
|
|
b11d89a |
-
|
|
|
b11d89a |
add_subdirectory(mongoose)
|
|
|
b11d89a |
add_subdirectory(cjson)
|
|
|
b11d89a |
|
|
|
ef5c24b |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
c340216 |
index fae003bc1..e70640d0f 100644
|
|
|
ef5c24b |
--- a/CMakeLists.txt
|
|
|
ef5c24b |
+++ b/CMakeLists.txt
|
|
|
12bd3e2 |
@@ -242,7 +242,6 @@ endif()
|
|
|
ef5c24b |
|
|
|
b11d89a |
if(ENABLE_FGCOM)
|
|
|
b11d89a |
set(ENABLE_IAX 1)
|
|
|
b11d89a |
- include_directories(${PROJECT_SOURCE_DIR}/3rdparty/iaxclient/lib ) # for iaxclient.h
|
|
|
b11d89a |
endif()
|
|
|
ef5c24b |
|
|
|
b11d89a |
# Setup MSVC 3rd party directories
|
|
|
58f8c2b |
diff --git a/CMakeModules/SetupFGFSLibraries.cmake b/CMakeModules/SetupFGFSLibraries.cmake
|
|
|
715a22b |
index d47fa7d94..9c2c9d6b1 100644
|
|
|
58f8c2b |
--- a/CMakeModules/SetupFGFSLibraries.cmake
|
|
|
58f8c2b |
+++ b/CMakeModules/SetupFGFSLibraries.cmake
|
|
|
58f8c2b |
@@ -23,7 +23,7 @@ function(setup_fgfs_libraries target)
|
|
|
58f8c2b |
endif()
|
|
|
58f8c2b |
|
|
|
58f8c2b |
if(ENABLE_IAX)
|
|
|
58f8c2b |
- target_link_libraries(${target} iaxclient_lib ${OPENAL_LIBRARY})
|
|
|
58f8c2b |
+ target_link_libraries(${target} iaxclient ${OPENAL_LIBRARY})
|
|
|
58f8c2b |
endif()
|
|
|
58f8c2b |
|
|
|
715a22b |
# manually created DBus target
|
|
|
ef5c24b |
diff --git a/src/Network/fgcom.cxx b/src/Network/fgcom.cxx
|
|
|
c340216 |
index cab79063d..f0abd31d9 100644
|
|
|
ef5c24b |
--- a/src/Network/fgcom.cxx
|
|
|
ef5c24b |
+++ b/src/Network/fgcom.cxx
|
|
|
c340216 |
@@ -40,7 +40,7 @@
|
|
|
ef5c24b |
#include <Navaids/navlist.hxx>
|
|
|
c340216 |
#include <Main/sentryIntegration.hxx>
|
|
|
ef5c24b |
|
|
|
ef5c24b |
-#include <3rdparty/iaxclient/lib/iaxclient.h>
|
|
|
ef5c24b |
+#include <iaxclient.h>
|
|
|
ef5c24b |
|
|
|
ef5c24b |
|
|
|
ef5c24b |
#define NUM_CALLS 4
|
|
|
ef5c24b |
diff --git a/utils/fgcom/CMakeLists.txt b/utils/fgcom/CMakeLists.txt
|
|
|
ed13be5 |
index 273c2d256..7d36f2839 100644
|
|
|
ef5c24b |
--- a/utils/fgcom/CMakeLists.txt
|
|
|
ef5c24b |
+++ b/utils/fgcom/CMakeLists.txt
|
|
|
6232c02 |
@@ -27,7 +27,7 @@ add_executable(${name}
|
|
|
dbe9423 |
)
|
|
|
dbe9423 |
|
|
|
dbe9423 |
target_link_Libraries(${name}
|
|
|
dbe9423 |
- iaxclient_lib
|
|
|
dbe9423 |
+ iaxclient
|
|
|
dbe9423 |
${OPENAL_LIBRARY}
|
|
|
6232c02 |
SimGearCore
|
|
|
6232c02 |
)
|
|
|
dbe9423 |
diff --git a/utils/fgcom/fgcom.cxx b/utils/fgcom/fgcom.cxx
|
|
|
ed13be5 |
index 0a8f46d24..22fda4705 100644
|
|
|
dbe9423 |
--- a/utils/fgcom/fgcom.cxx
|
|
|
dbe9423 |
+++ b/utils/fgcom/fgcom.cxx
|
|
|
dbe9423 |
@@ -36,7 +36,7 @@
|
|
|
dbe9423 |
#include <simgear/debug/logstream.hxx>
|
|
|
dbe9423 |
#include <simgear/timing/timestamp.hxx>
|
|
|
dbe9423 |
|
|
|
dbe9423 |
-#include <3rdparty/iaxclient/lib/iaxclient.h>
|
|
|
dbe9423 |
+#include <iaxclient.h>
|
|
|
dbe9423 |
|
|
|
dbe9423 |
#include "fgcom.hxx"
|
|
|
dbe9423 |
#include "positions.hxx" // provides _positionsData[];
|
|
|
58f8c2b |
--
|
|
|
c340216 |
2.31.1
|
|
|
58f8c2b |
|