Warnings fixed on VC++ 2015

This commit is contained in:
Bertrand Songis
2016-03-27 09:54:41 +02:00
parent 8c636e31d9
commit 8d5e5b2d01
2 changed files with 2 additions and 3 deletions
+2 -2
View File
@@ -222,8 +222,8 @@
#endif
#if defined(SIMU)
#ifndef FORCEINLINE
#define FORCEINLINE
#if !defined(FORCEINLINE)
#define FORCEINLINE inline
#endif
#if !defined(NOINLINE)
#define NOINLINE
-1
View File
@@ -20,7 +20,6 @@ endif()
if(MSVC)
set(CMAKE_CXX_FLAGS "/EHsc /LD")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /FORCE:MULTIPLE")
include_directories(${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes C:/Programs/dirent/include)
target_link_libraries(${SIMULATOR_TARGET} PRIVATE C:/Programs/pthreads/Pre-built.2/lib/pthreadVC2.lib)
else()