pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-14 03:38:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into char_to_string

Browse Source 
Conflicts:
	common/dbcore.h
This commit is contained in:
Arthur Ice
2013-05-25 21:30:21 -07:00
parent 1b9004445d 52b8c0e078
commit a372ba3d39
55 changed files with 576 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ucs/CMakeLists.txt
+2
View File
@@ -19,6 +19,8 @@ SET(ucs_headers
ADD_EXECUTABLE(ucs ${ucs_sources} ${ucs_headers})
INSTALL(TARGETS ucs RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
ADD_DEFINITIONS(-DUCS)
TARGET_LINK_LIBRARIES(ucs Common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} ${ZLIB_LIBRARY})