diff --git a/.gitmodules b/.gitmodules index 700af743b..77982c7d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,9 @@ [submodule "plugins/stonesense"] path = plugins/stonesense url = git://github.com/peterix/stonesense.git +[submodule "plugins/isoworld"] + path = plugins/isoworld + url = git://github.com/peterix/isoworld.git [submodule "plugins/df2mc"] path = plugins/df2mc url = git://github.com/peterix/DF2MC.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 95b80f50c..c7c84e859 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,8 @@ IF(UNIX) SET(CMAKE_C_FLAGS "-fvisibility=hidden -m32 -march=i686 -mtune=generic") ELSEIF(MSVC) # for msvc, tell it to always use 8-byte pointers to member functions to avoid confusion - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /vmg /vmm") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /vmg /vmm /MP") + SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od") ENDIF() # use shared libraries for protobuf diff --git a/Compile.html b/Compile.html index e5f6ca679..99fdf98e7 100644 --- a/Compile.html +++ b/Compile.html @@ -3,13 +3,13 @@
- +