From d5cbf57e1b0f6e4eedede9fcab5b34945245653b Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 24 Dec 2015 11:00:54 +0100
Subject: [PATCH] VC++ compilation

---
 companion/src/CMakeLists.txt           |  8 +-------
 radio/src/CMakeLists.txt               |  4 +++-
 radio/src/bitmaps/horus/CMakeLists.txt | 21 ++++++++++-----------
 radio/src/lua/CMakeLists.txt           |  4 ++++
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt
index d5568888e..7ffd81a82 100644
--- a/companion/src/CMakeLists.txt
+++ b/companion/src/CMakeLists.txt
@@ -92,8 +92,7 @@ add_custom_command(
 
 if(MSVC)
   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)
+  include_directories(${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes C:/Programs/dirent/include)
   link_directories(C:/Programs/pthreads/Pre-built.2/lib/)
   set(PTHREAD_LIBRARY pthreadVC2.lib)
 else()
@@ -102,11 +101,6 @@ else()
   link_directories(/usr/local/lib)
 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(SIMU_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src/simulation)
 set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src)
diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index caa6a3615..59971ec7d 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -651,7 +651,9 @@ endforeach()
 
 add_definitions(-DCORRECT_NEGATIVE_SHIFTS)
 
-add_subdirectory(targets/simu)
+if(NOT WIN32)
+  add_subdirectory(targets/simu)
+endif()
 
 set(SRC ${SRC} ${FIRMWARE_SRC})
 
diff --git a/radio/src/bitmaps/horus/CMakeLists.txt b/radio/src/bitmaps/horus/CMakeLists.txt
index 2541fb9c9..de04777ae 100644
--- a/radio/src/bitmaps/horus/CMakeLists.txt
+++ b/radio/src/bitmaps/horus/CMakeLists.txt
@@ -1,12 +1,11 @@
-add_truetype_font_target(horus tinsize "DejaVu Sans" 9)
-add_truetype_font_target(horus smlsize "DejaVu Sans" 13)
-add_truetype_font_target(horus stdsize "DejaVu Sans" 16)
-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 tinsize "DejaVu Sans" 9)
+ add_truetype_font_target(horus smlsize "DejaVu Sans" 13)
+ add_truetype_font_target(horus stdsize "DejaVu Sans" 16)
+ add_truetype_font_target(horus midsize "DejaVu Sans" 24)
+ 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_masks ${RADIO_SRC_DIRECTORY}/bitmaps/horus/mask_*.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 horus_fonts)
+ 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_fonts ${RADIO_SRC_DIRECTORY}/fonts/horus/*.png 480 8bits)
+ add_dependencies(horus_bitmaps horus_masks)
diff --git a/radio/src/lua/CMakeLists.txt b/radio/src/lua/CMakeLists.txt
index 75aab23de..635ffce05 100644
--- a/radio/src/lua/CMakeLists.txt
+++ b/radio/src/lua/CMakeLists.txt
@@ -1,3 +1,7 @@
+if(MSVC)
+  set(INTTYPES_INCLUDE_OPTION -IC:/Programs/msinttypes)
+endif()
+
 macro(add_lua_export_target target)
   add_custom_command(
     OUTPUT lua_exports_${target}.inc