diff --git a/CMakeLists.txt b/CMakeLists.txt index d5300a609..02652ffc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,7 +207,7 @@ ENDIF() NL_CONFIGURE_CHECKS() IF(WITH_STATIC_LIBXML2) - SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC) + ADD_DEFINITIONS(-DLIBXML_STATIC) ENDIF() IF(WITH_LIBXML2_ICONV) diff --git a/CMakeModules/nel.cmake b/CMakeModules/nel.cmake index 5cb0063df..abdd9ad23 100644 --- a/CMakeModules/nel.cmake +++ b/CMakeModules/nel.cmake @@ -1268,7 +1268,9 @@ MACRO(SETUP_EXTERNAL) SET(CMAKE_USE_PTHREADS_INIT 1) SET(Threads_FOUND TRUE) ELSE() - SET(THREADS_HAVE_PTHREAD_ARG ON) + IF(NOT MSVC) + SET(THREADS_HAVE_PTHREAD_ARG ON) + ENDIF() FIND_PACKAGE(Threads) # TODO: replace all -l by absolute path to in CMAKE_THREAD_LIBS_INIT ENDIF() diff --git a/nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.cpp b/nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.cpp index eaadf1b01..57d84d412 100644 --- a/nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.cpp +++ b/nel/tools/3d/plugin_max/nel_3dsmax_shared/StdAfx.cpp @@ -21,5 +21,3 @@ // and not in this file #include "stdafx.h" - -void nlmax_shared_stdafx_dummy() { } diff --git a/nel/tools/3d/plugin_max/nel_export/std_afx.cpp b/nel/tools/3d/plugin_max/nel_export/std_afx.cpp index 106862518..6dd138ea7 100644 --- a/nel/tools/3d/plugin_max/nel_export/std_afx.cpp +++ b/nel/tools/3d/plugin_max/nel_export/std_afx.cpp @@ -18,6 +18,3 @@ // along with this program. If not, see . #include "std_afx.h" - -void nlmax_nel_export_std_afx_dummy() { } - diff --git a/nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.cpp b/nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.cpp index e4d097482..8ce177129 100644 --- a/nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.cpp +++ b/nel/tools/3d/plugin_max/nel_mesh_lib/StdAfx.cpp @@ -19,6 +19,3 @@ #include "stdafx.h" - -void nlmax_mesh_library_stdafx_dummy() { } - diff --git a/nel/tools/3d/plugin_max/nel_patch_edit/stdafx.cpp b/nel/tools/3d/plugin_max/nel_patch_edit/stdafx.cpp index a849e7019..62eecad20 100644 --- a/nel/tools/3d/plugin_max/nel_patch_edit/stdafx.cpp +++ b/nel/tools/3d/plugin_max/nel_patch_edit/stdafx.cpp @@ -1,3 +1 @@ #include "stdafx.h" - -void nlmax_patch_edit_stdafx_dummy() { } diff --git a/nel/tools/3d/plugin_max/nel_patch_lib/stdafx.cpp b/nel/tools/3d/plugin_max/nel_patch_lib/stdafx.cpp index 43e1a6a7b..efdc43314 100644 --- a/nel/tools/3d/plugin_max/nel_patch_lib/stdafx.cpp +++ b/nel/tools/3d/plugin_max/nel_patch_lib/stdafx.cpp @@ -18,5 +18,3 @@ // along with this program. If not, see . #include "stdafx.h" - -void nlmax_patch_library_stdafx_dummy() { } diff --git a/nel/tools/3d/plugin_max/nel_patch_paint/stdafx.cpp b/nel/tools/3d/plugin_max/nel_patch_paint/stdafx.cpp index 7f7ce72f7..62eecad20 100644 --- a/nel/tools/3d/plugin_max/nel_patch_paint/stdafx.cpp +++ b/nel/tools/3d/plugin_max/nel_patch_paint/stdafx.cpp @@ -1,3 +1 @@ #include "stdafx.h" - -void nlmax_patch_painter_stdafx_dummy() { }