summaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorQuietust2012-09-13 14:30:44 -0500
committerQuietust2012-09-13 14:30:44 -0500
commit1d8c9a6a5feadfc03707677588031bf85631a7c6 (patch)
tree6a492801a2ff0f487ab046014d32bbe8517405fd /depends
parentcae01250ff5bc3df14677371459ef3b8b6451a08 (diff)
parent24b93ea61fd1cb6ad69c2e3beab182f5f60646c7 (diff)
downloaddfhack-1d8c9a6a5feadfc03707677588031bf85631a7c6.tar.gz
dfhack-1d8c9a6a5feadfc03707677588031bf85631a7c6.tar.bz2
dfhack-1d8c9a6a5feadfc03707677588031bf85631a7c6.tar.xz
Merge https://github.com/danaris/dfhack
Diffstat (limited to 'depends')
m---------depends/clsocket0
-rw-r--r--depends/protobuf/CMakeLists.txt6
2 files changed, 3 insertions, 3 deletions
diff --git a/depends/clsocket b/depends/clsocket
-Subproject d0b2d0750dc2d529a152eba4f3f519f69ff7eab
+Subproject 3808a8ac4fc1bbc0422492cb042099c47a312b5
diff --git a/depends/protobuf/CMakeLists.txt b/depends/protobuf/CMakeLists.txt
index 24c4b275..5034f00f 100644
--- a/depends/protobuf/CMakeLists.txt
+++ b/depends/protobuf/CMakeLists.txt
@@ -7,10 +7,10 @@ IF(CMAKE_COMPILER_IS_GNUCC)
STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${GCC_VERSION})
LIST(GET GCC_VERSION_COMPONENTS 0 GCC_MAJOR)
LIST(GET GCC_VERSION_COMPONENTS 1 GCC_MINOR)
- IF(GCC_MAJOR LESS 4 OR (GCC_MAJOR EQUAL 4 AND GCC_MINOR LESS 2))
+ #IF(GCC_MAJOR LESS 4 OR (GCC_MAJOR EQUAL 4 AND GCC_MINOR LESS 2))
#GCC is too old
- SET(STL_HASH_OLD_GCC 1)
- ENDIF()
+ # SET(STL_HASH_OLD_GCC 1)
+ #ENDIF()
#SET(CMAKE_CXX_FLAGS "-std=c++0x")
SET(HAVE_HASH_MAP 0)