pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-03 17:46:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into small_stage_cleanup

Browse Source 
Conflicts:
	common/EQStream.cpp
	zone/client.h
This commit is contained in:
Arthur Ice
2013-05-23 12:49:22 -07:00
parent e5d4b35a32 815c3dc73f
commit fcb769e353
23 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/CMakeLists.txt
-1
View File
@@ -70,7 +70,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)