Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes

This commit is contained in:
j883376
2013-05-23 21:12:07 -04:00
219 changed files with 2420 additions and 2489 deletions
-1
View File
@@ -72,7 +72,6 @@ ADD_DEFINITIONS(-DWORLD)
TARGET_LINK_LIBRARIES(world Common ${PERL_LIBRARY} debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY})
IF(MSVC)
SET_TARGET_PROPERTIES(world PROPERTIES LINK_FLAGS_RELEASE "/OPT:REF /OPT:ICF")
TARGET_LINK_LIBRARIES(world "Ws2_32.lib")
ENDIF(MSVC)