[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] applications/XPlaneHLAPlugin CMakeLists.txt Fin...
From: |
certi-cvs |
Subject: |
[certi-cvs] applications/XPlaneHLAPlugin CMakeLists.txt Fin... |
Date: |
Tue, 15 Dec 2009 09:49:26 +0000 |
CVSROOT: /sources/certi
Module name: applications
Changes by: Petr Gotthard <gotthardp> 09/12/15 09:49:26
Modified files:
XPlaneHLAPlugin: CMakeLists.txt FindXPlane.cmake
XPlaneHLAPlugin/XPlane_Trace: XP_Init.cpp
Log message:
bug #24763: fixed cmake and build errors
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/XPlaneHLAPlugin/CMakeLists.txt?cvsroot=certi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/applications/XPlaneHLAPlugin/FindXPlane.cmake?cvsroot=certi&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/applications/XPlaneHLAPlugin/XPlane_Trace/XP_Init.cpp?cvsroot=certi&r1=1.1&r2=1.2
Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/XPlaneHLAPlugin/CMakeLists.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CMakeLists.txt 25 Jun 2009 18:32:56 -0000 1.5
+++ CMakeLists.txt 15 Dec 2009 09:49:25 -0000 1.6
@@ -85,9 +85,9 @@
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
FIND_PACKAGE(XPlane)
-FIND_PACKAGE(PhiDget)
+INCLUDE_DIRECTORIES(XPlane_Common ${XPLANE_XPLM_INCLUDE_DIR}
${XPLANE_XPW_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(XPlane_Common)
+FIND_PACKAGE(PhiDget)
IF (PHIDGET_FOUND)
ADD_SUBDIRECTORY(XPlane_PhiDget)
ENDIF(PHIDGET_FOUND)
Index: FindXPlane.cmake
===================================================================
RCS file: /sources/certi/applications/XPlaneHLAPlugin/FindXPlane.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- FindXPlane.cmake 25 Jun 2009 18:32:56 -0000 1.3
+++ FindXPlane.cmake 15 Dec 2009 09:49:26 -0000 1.4
@@ -1,16 +1,21 @@
+# Set the default XPLANE_ROOT value
+IF(NOT XPLANE_ROOT)
+ SET(XPLANE_ROOT $ENV{XPLANE_ROOT} CACHE PATH "The X-Plane directory root.")
+ENDIF(NOT XPLANE_ROOT)
+
MACRO(MESSAGE_QUIETLY QUIET TYPE MSG)
IF(NOT ${QUIET})
MESSAGE(${TYPE} "${MSG}")
ENDIF(NOT ${QUIET})
ENDMACRO(MESSAGE_QUIETLY QUIET TYPE MSG)
-#########################################################################
-#Look for Xplane.exe
-#########################################################################
+
+# Look for X-Plane executable
FIND_PROGRAM(XPLANE_EXECUTABLE
NAMES X-Plane.exe
- PATHS "C:\\Program Files\\X-Plane"
+ PATHS
+ ${XPLANE_ROOT}
PATH_SUFFIXES
- DOC "XPlane Software")
+ DOC "X-Plane Software")
IF (XPLANE_EXECUTABLE)
IF (NOT XPLANE_FIND_QUIETLY)
@@ -26,68 +31,37 @@
ENDIF(NOT XPLANE_FIND_QUIETLY)
ENDIF (XPLANE_EXECUTABLE)
-#########################################################################
-# Go to subdirs XPLANE_LIBRARY
-#########################################################################
+# Look for SDK libraries and header files
FIND_LIBRARY(XPLANE_XPLM_LIBRARY
NAMES XPLM
- PATHS "C:\\Program Files\\X-Plane\\X-Plane
PlugIn\\XPSDK200b1\\Libraries"
+ PATHS
+ ${XPLANE_ROOT}/SDK/Libraries/Win
PATH_SUFFIXES lib
- DOC "The XPLANE Library")
-
-FIND_LIBRARY(XPLANE_XPWidgets_LIBRARY
- NAMES XPWidgets
- PATHS "C:\\Program Files\\X-Plane\\X-Plane
PlugIn\\XPSDK200b1\\Libraries"
- PATH_SUFFIXES lib
- DOC "The XPLANE Library")
-
-IF (XPLANE_XPLM_LIBRARY)
- IF (NOT XPLANE_FIND_QUIETLY)
- MESSAGE_QUIETLY(XPLANE_FIND_QUIETLY STATUS "Looking for XPlane library...
- found ${XPLANE_LIBRARY}")
- ENDIF(NOT XPLANE_FIND_QUIETLY)
- SET(XPLANE_FOUND "YES")
- LIST(APPEND XPLANE_LIBRARIES ${XPLANE_XPLM_LIBRARY}
${XPLANE_XPWidgets_LIBRARY})
-ELSE (XPLANE_XPLM_LIBRARY)
- SET(XPLANE_FOUND "NO")
- IF (NOT XPLANE_FIND_QUIETLY)
- MESSAGE_QUIETLY(XPLANE_FIND_QUIETLY STATUS "Looking for XPlane
library... - NOT FOUND")
- ENDIF(NOT XPLANE_FIND_QUIETLY)
-ENDIF (XPLANE_XPLM_LIBRARY)
+ DOC "The X-Plane Library")
-IF (XPLANE_XPLM_LIBRARY)
- GET_FILENAME_COMPONENT(XPLANE_LIBRARY_DIRS ${XPLANE_XPLM_LIBRARY} PATH)
-ENDIF (XPLANE_XPLM_LIBRARY)
-
-#########################################################################
-# Go to subdirs XPLANE_XPLM_INCLUDE_DIRECTORY
-#########################################################################
-FIND_FILE(XPLANE_XPLM_INCLUDE_DIRECTORY
+FIND_PATH(XPLANE_XPLM_INCLUDE_DIR
NAMES XPLMPlugin.h
- PATHS "C:/Program Files/X-Plane PlugIn/XPSDK200b1/CHeaders/XPLM"
+ PATHS
+ ${XPLANE_ROOT}/SDK/CHeaders/XPLM
DOC "The XPLANE_XPLM Include Directory")
-IF(IS_DIRECTORY XPLANE_XPLM_INCLUDE_DIRECTORY)
- LIST(APPEND XPLANE_XPLM_INCLUDE_DIRS ${XPLANE_XPLM_INCLUDE_DIRECTORY})
-ELSE(IS_DIRECTORY XPLANE_XPLM_INCLUDE_DIRECTORY)
- IF (XPLANE_XPLM_INCLUDE_DIRECTORY)
- GET_FILENAME_COMPONENT(XPLANE_XPLM_INCLUDE_DIRS
${XPLANE_XPLM_INCLUDE_DIRECTORY} PATH)
- ENDIF (XPLANE_XPLM_INCLUDE_DIRECTORY)
- INCLUDE_DIRECTORIES(${XPLANE_XPLM_INCLUDE_DIRS})
-ENDIF(IS_DIRECTORY XPLANE_XPLM_INCLUDE_DIRECTORY)
-
-#########################################################################
-# Go to subdirs XPLANE_XPW_INCLUDE_DIRECTORY
-#########################################################################
-FIND_FILE(XPLANE_XPW_INCLUDE_DIRECTORY
+FIND_LIBRARY(XPLANE_XPW_LIBRARY
+ NAMES XPWidgets
+ PATHS
+ ${XPLANE_ROOT}/SDK/Libraries/Win
+ PATH_SUFFIXES lib
+ DOC "The X-Plane Library")
+
+FIND_PATH(XPLANE_XPW_INCLUDE_DIR
NAMES XPWidgets.h
- PATHS "C:/Program Files/X-Plane/X-Plane
PlugIn/XPSDK200b1/CHeaders/Widgets"
+ PATHS
+ ${XPLANE_ROOT}/SDK/CHeaders/Widgets
DOC "The XPLANE_XPW Include Directory")
-IF(IS_DIRECTORY XPLANE_XPW_INCLUDE_DIRECTORY)
- LIST(APPEND XPLANE_XPW_INCLUDE_DIRS ${XPLANE_XPW_INCLUDE_DIRECTORY})
-ELSE(IS_DIRECTORY XPLANE_XPW_INCLUDE_DIRECTORY)
- IF (XPLANE_XPW_INCLUDE_DIRECTORY)
- GET_FILENAME_COMPONENT(XPLANE_XPW_INCLUDE_DIRS
${XPLANE_XPW_INCLUDE_DIRECTORY} PATH)
- ENDIF (XPLANE_XPW_INCLUDE_DIRECTORY)
-INCLUDE_DIRECTORIES(${XPLANE_XPW_INCLUDE_DIRS})
-ENDIF(IS_DIRECTORY XPLANE_XPW_INCLUDE_DIRECTORY)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(X-Plane DEFAULT_MSG
+ XPLANE_EXECUTABLE
+ XPLANE_XPLM_LIBRARY XPLANE_XPLM_INCLUDE_DIR
+ XPLANE_XPW_LIBRARY XPLANE_XPW_INCLUDE_DIR)
+
+LIST(APPEND XPLANE_LIBRARIES ${XPLANE_XPLM_LIBRARY} ${XPLANE_XPW_LIBRARY})
Index: XPlane_Trace/XP_Init.cpp
===================================================================
RCS file: /sources/certi/applications/XPlaneHLAPlugin/XPlane_Trace/XP_Init.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- XPlane_Trace/XP_Init.cpp 6 Nov 2008 08:02:01 -0000 1.1
+++ XPlane_Trace/XP_Init.cpp 15 Dec 2009 09:49:26 -0000 1.2
@@ -1,6 +1,7 @@
#include <iostream>
#include <memory>
#include <string>
+#include <limits>
#include "XP_Trace.h"
@@ -72,9 +73,7 @@
while (1)
{
- Sleep(900);
- theFederate->tick(); //Accès aux 2 Classes
- theFederate->tick();
+ theFederate->tick(1,10);
}
theFederate->destroyFederate();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] applications/XPlaneHLAPlugin CMakeLists.txt Fin...,
certi-cvs <=