Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

VC++ compilation

Browse source
This commit is contained in:
Bertrand Songis 2015-12-24 11:00:54 +01:00
parent cc40d1e611
commit d5cbf57e1b
4 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
companion/src/CMakeLists.txt
View file

@ -92,8 +92,7 @@ add_custom_command(
if(MSVC) if(MSVC)
set(CMAKE_CXX_FLAGS "/EHsc /LD") set(CMAKE_CXX_FLAGS "/EHsc /LD")
set(INTTYPES_INCLUDE_OPTION -IC:/Programs/msinttypes) include_directories(${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes C:/Programs/dirent/include)
include_directories(${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes)
link_directories(C:/Programs/pthreads/Pre-built.2/lib/) link_directories(C:/Programs/pthreads/Pre-built.2/lib/)
set(PTHREAD_LIBRARY pthreadVC2.lib) set(PTHREAD_LIBRARY pthreadVC2.lib)
else() else()
@ -102,11 +101,6 @@ else()
link_directories(/usr/local/lib) link_directories(/usr/local/lib)
endif() endif()
if(MSVC)
message(STATUS "Adding include C:/Programs/dirent/include for dirent.h")
include_directories(C:/Programs/dirent/include)
endif()
set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/radio/src) set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/radio/src)
set(SIMU_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src/simulation) set(SIMU_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src/simulation)
set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src) set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src)

4
radio/src/CMakeLists.txt
View file

@ -651,7 +651,9 @@ endforeach()
add_definitions(-DCORRECT_NEGATIVE_SHIFTS) add_definitions(-DCORRECT_NEGATIVE_SHIFTS)
add_subdirectory(targets/simu) if(NOT WIN32)
add_subdirectory(targets/simu)
endif()
set(SRC ${SRC} ${FIRMWARE_SRC}) set(SRC ${SRC} ${FIRMWARE_SRC})

21
radio/src/bitmaps/horus/CMakeLists.txt
View file

@ -1,12 +1,11 @@
add_truetype_font_target(horus tinsize "DejaVu Sans" 9) add_truetype_font_target(horus tinsize "DejaVu Sans" 9)
add_truetype_font_target(horus smlsize "DejaVu Sans" 13) add_truetype_font_target(horus smlsize "DejaVu Sans" 13)
add_truetype_font_target(horus stdsize "DejaVu Sans" 16) add_truetype_font_target(horus stdsize "DejaVu Sans" 16)
add_truetype_font_target(horus midsize "DejaVu Sans" 24) add_truetype_font_target(horus midsize "DejaVu Sans" 24)
add_truetype_font_target(horus dblsize "DejaVu Sans" 32) add_truetype_font_target(horus xxlsize "DejaVu Sans" 48)
add_truetype_font_target(horus xxlsize "DejaVu Sans" 48) add_custom_target(ttf_horus_fonts DEPENDS ttf_horus_tinsize ttf_horus_smlsize ttf_horus_stdsize ttf_horus_midsize ttf_horus_dblsize ttf_horus_xxlsize)
add_bitmaps_target(horus_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/????[^_]*.png" 480 5/6/5/8) add_bitmaps_target(horus_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/????[^_]*.png" 480 5/6/5/8)
add_bitmaps_target(horus_masks ${RADIO_SRC_DIRECTORY}/bitmaps/horus/mask_*.png 480 8bits) add_bitmaps_target(horus_masks ${RADIO_SRC_DIRECTORY}/bitmaps/horus/mask_*.png 480 8bits)
add_bitmaps_target(horus_fonts ${RADIO_SRC_DIRECTORY}/fonts/horus/*.png 480 8bits) add_bitmaps_target(horus_fonts ${RADIO_SRC_DIRECTORY}/fonts/horus/*.png 480 8bits)
add_dependencies(horus_fonts ttf_horus_tinsize ttf_horus_smlsize ttf_horus_stdsize ttf_horus_midsize ttf_horus_dblsize ttf_horus_xxlsize) add_dependencies(horus_bitmaps horus_masks)
add_dependencies(horus_bitmaps horus_masks horus_fonts)

4
radio/src/lua/CMakeLists.txt
View file

@ -1,3 +1,7 @@
if(MSVC)
set(INTTYPES_INCLUDE_OPTION -IC:/Programs/msinttypes)
endif()
macro(add_lua_export_target target) macro(add_lua_export_target target)
add_custom_command( add_custom_command(
OUTPUT lua_exports_${target}.inc OUTPUT lua_exports_${target}.inc