Changeset 45 in flair-src for trunk/lib/FlairSimulator
- Timestamp:
- Jul 18, 2016, 4:13:56 PM (8 years ago)
- Location:
- trunk/lib/FlairSimulator
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/FlairSimulator/CMakeLists.txt
r8 r45 22 22 ${CMAKE_CURRENT_SOURCE_DIR}/src 23 23 ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported 24 # $ENV{FLAIR_ROOT}/uav_dev/include25 24 ${CMAKE_CURRENT_SOURCE_DIR}/../FlairCore/src 26 25 ${CMAKE_CURRENT_SOURCE_DIR}/../FlairSensorActuator/src … … 34 33 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) 35 34 35 add_custom_target( 36 compile_info 37 COMMAND $ENV{FLAIR_ROOT}/flair-dev/scripts/compile_info.sh ${CMAKE_C_COMPILER} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/unexported/compile_info.h 38 ) 39 36 40 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/no_gl) 41 add_dependencies(FlairSimulator_nogl compile_info) 37 42 if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i686" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "i586" OR "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") 38 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gl) 43 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/gl) 44 add_dependencies(FlairSimulator_gl compile_info) 39 45 endif() -
trunk/lib/FlairSimulator/src/Gui.cpp
r15 r45 31 31 #include <algorithm> 32 32 #include <GL/gl.h> 33 #include "compile_info.h" 34 35 //todo: put it on seprate file, but not possible with static lib? 36 static void constructor() __attribute__((constructor)); 37 38 void constructor() { 39 compile_info("FlairSensorActuator"); 40 } 33 41 34 42 using namespace irr;
Note:
See TracChangeset
for help on using the changeset viewer.