From: Bertrand <bco...@us...> - 2017-02-25 14:23:22
|
Update of /cvsroot/jsbsim/JSBSim/src/simgear In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24758/src/simgear Modified Files: CMakeLists.txt compiler.h Log Message: JSBSim now uses SGPath to manage file names. It allows to use absolute paths, to use Unicode file names and to benefit from SimGear maintenance for the corresponding code. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/simgear/CMakeLists.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** CMakeLists.txt 16 Feb 2014 14:07:52 -0000 1.3 --- CMakeLists.txt 25 Feb 2017 14:23:19 -0000 1.4 *************** *** 4,13 **** --- 4,16 ---- add_subdirectory(misc) add_subdirectory(xml) + add_subdirectory(io/iostreams) set(JSBSIM_SIMGEAR_HDR compiler.h) propagate_source_files(SIMGEAR MAGVAR) + propagate_source_files(SIMGEAR MISC) propagate_source_files(SIMGEAR PROPS) propagate_source_files(SIMGEAR XML) + propagate_source_files(SIMGEAR IOSTREAMS) install(FILES ${JSBSIM_SIMGEAR_HDR} DESTINATION include/JSBSim/simgear) Index: compiler.h =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/simgear/compiler.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** compiler.h 18 May 2007 03:17:41 -0000 1.3 --- compiler.h 25 Feb 2017 14:23:19 -0000 1.4 *************** *** 28,29 **** --- 28,65 ---- #define SG_LOG(type, level, message) (cout <<message << endl) #define SG_USING_STD(X) using std::X + + #ifdef __APPLE__ + # define SG_MAC + # define SG_UNIX + #endif + + #if defined (__FreeBSD__) + # define SG_UNIX + #endif + + #if defined (__CYGWIN__) + # define SG_WINDOWS + # define SG_UNIX + # include <ieeefp.h> // isnan + #endif + + // includes both MSVC and mingw compilers + #if defined(_WIN32) || defined(__WIN32__) + # define SG_WINDOWS + #endif + + #if defined(__linux__) || defined(_AIX) || defined ( sgi ) + # define SG_UNIX + #endif + + #if defined( __GNUC__ ) + # define DEPRECATED __attribute__ ((deprecated)) + #else + # define DEPRECATED + #endif + + #if defined(__clang__) + # define SG_NO_RETURN [[noreturn]] + #else + # define SG_NO_RETURN + #endif |