Merge branch 'master' into lua

This commit is contained in:
KimLS
2013-05-11 20:35:49 -07:00
16 changed files with 115 additions and 21 deletions
+3 -1
View File
@@ -180,7 +180,9 @@ IF(MINGW)
ENDIF(MINGW)
IF(UNIX)
TARGET_LINK_LIBRARIES(zone "dl")
IF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(zone "dl")
ENDIF(NOT FREEBSD)
TARGET_LINK_LIBRARIES(zone "z")
TARGET_LINK_LIBRARIES(zone "m")
TARGET_LINK_LIBRARIES(zone "rt")