schiff

commit 7efd6868325dab3912eb3405d8f226c857a8e0d9
parent 3cc74915ffcf5f6bdb9cf56931fb6f040158cf47
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 18 Nov 2015 17:43:59 +0100

Fix compilation errors and warnings on CL

Diffstat:
M
cmake/CMakeLists.txt
 | 
4
+++-
M
src/schiff.c
 | 
3
++-
M
src/schiff_streamline.h
 | 
1
-

3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -87,10 +87,11 @@ if(CMAKE_COMPILER_IS_GNUCC)
 endif()
 
 add_executable(schiff ${SCHIFF_FILES_SRC} ${SCHIFF_FILES_INC})
-target_link_libraries(schiff RSys Star3D StarSchiff StarSP ${MATH_LIB})
+target_link_libraries(schiff MuslGetopt RSys Star3D StarSchiff StarSP ${MATH_LIB})
 set_target_properties(schiff PROPERTIES
   VERSION ${VERSION}
   SOVERSION ${VERSION_MAJOR})
+rcmake_copy_runtime_libraries(schiff)
 
 ################################################################################
 # Define output & install directories
@@ -100,4 +101,5 @@ install(TARGETS schiff
   LIBRARY DESTINATION lib
   RUNTIME DESTINATION bin)
 install(FILES ${SCHIFF_FILES_DOC} DESTINATION doc/schiff)
+rcmake_install_runtime_libraries(schiff)
 
diff --git a/src/schiff.c b/src/schiff.c
@@ -246,7 +246,8 @@ main(int argc, char** argv)
 exit:
   schiff_args_release(&args);
   if(mem_allocated_size() != 0) {
-    fprintf(stderr, "Memory leaks: %lu Bytes\n", mem_allocated_size());
+    fprintf(stderr, "Memory leaks: %lu Bytes\n",
+      (unsigned long) mem_allocated_size());
   }
   return err;
 error:
diff --git a/src/schiff_streamline.h b/src/schiff_streamline.h
@@ -84,7 +84,6 @@ exit:
   *out_line = line;
   return res;
 error:
-  line = NULL;
   goto error;
 }