Fixed some windows related issues, not including tasm in compilation yet

Scott Klum
1 parent ae1688b1
Showing 4 changed files with 5 additions and 3 deletions
3rdparty/stasm/stasm/CMakeLists.txt
3rdparty/stasm/stasm/stasm/src/err.cpp
3rdparty/stasm/stasm/stasm/src/print.cpp
share/openbr/cmake/FindStasm4.cmake
@@ -19,6 +19,6 @@ set_target_properties(stasm PROPERTIES
 target_link_libraries(stasm ${OpenCV_LIBS} ${Qt5Core_QTMAIN_LIBRARIES})
  
 install(DIRECTORY stasm/include/ DESTINATION include/stasm)
-install(DIRECTORY tasm/include/ DESTINATION include/tasm)
+#install(DIRECTORY tasm/include/ DESTINATION include/tasm)
  
 install(TARGETS stasm RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
@@ -28,6 +28,8 @@
 #include "err.h"
 #include "misc.h"
  
+#include <stdarg.h>
+
 namespace stasm
 {
 static char err_g[SBIG]; // err msg saved for retrieval by LastErr and stasm_lasterr
@@ -7,6 +7,7 @@
 #include "misc.h"
  
 #include <sys/stat.h>
+#include <stdarg.h>
  
 namespace stasm
 {
@@ -22,14 +22,13 @@ foreach(CACHE_VAR ${CACHE_VARS})
     else()
       set(CACHE_VAR_TYPE :${CACHE_VAR_TYPE})
     endif()
-
 	if(CACHE_VAR STREQUAL "CMAKE_PREFIX_PATH")
 		set(CMAKE_PREFIX_PATH "\"${${CACHE_VAR}}\"")
 	endif()
   endif()
 endforeach()
  
-find_path(STASM4_SOURCE_DIR stasm/include/stasm_lib.h ${CMAKE_SOURCE_DIR}/3rdparty/*)
+find_path(STASM4_SOURCE_DIR stasm/stasm/include/stasm_lib.h ${CMAKE_SOURCE_DIR}/3rdparty/*)
  
 set(STASM4_PREFIX "${CMAKE_BINARY_DIR}/stasm")
 set(STASM4_INSTALL_DIR "${CMAKE_BINARY_DIR}/stasm")