Warnings fixed on VC++ 2015
This commit is contained in:
+2
-2
@@ -222,8 +222,8 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(SIMU)
|
#if defined(SIMU)
|
||||||
#ifndef FORCEINLINE
|
#if !defined(FORCEINLINE)
|
||||||
#define FORCEINLINE
|
#define FORCEINLINE inline
|
||||||
#endif
|
#endif
|
||||||
#if !defined(NOINLINE)
|
#if !defined(NOINLINE)
|
||||||
#define NOINLINE
|
#define NOINLINE
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ endif()
|
|||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
set(CMAKE_CXX_FLAGS "/EHsc /LD")
|
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)
|
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)
|
target_link_libraries(${SIMULATOR_TARGET} PRIVATE C:/Programs/pthreads/Pre-built.2/lib/pthreadVC2.lib)
|
||||||
else()
|
else()
|
||||||
|
|||||||
Reference in New Issue
Block a user