pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 13:16:39 +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
common/CMakeLists.txt
-1
View File
@@ -313,7 +313,6 @@ INCLUDE_DIRECTORIES(Patches SocketLib StackWalker TinyXML)
ADD_LIBRARY(Common ${common_sources} ${common_headers})
IF(UNIX)
ADD_DEFINITIONS(-fPIC)
SET_SOURCE_FILES_PROPERTIES("patches/SoD.cpp" "patches/SoF.cpp" "patches/RoF.cpp" "patches/Underfoot.cpp" PROPERTIES COMPILE_FLAGS -O0)