summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-13 20:42:55 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-13 20:42:55 +0000
commitb111ed855ab5a114c62767f0a5a9dd4dad233db5 (patch)
tree1a0363bb36c0fda5fb4cc09fc92deb3de976d937
parent239a6b0dbb53c6a1c0df2f90a43627ab144255ea (diff)
downloadhercules-b111ed855ab5a114c62767f0a5a9dd4dad233db5.tar.gz
hercules-b111ed855ab5a114c62767f0a5a9dd4dad233db5.tar.bz2
hercules-b111ed855ab5a114c62767f0a5a9dd4dad233db5.tar.xz
hercules-b111ed855ab5a114c62767f0a5a9dd4dad233db5.zip
* Merged changes up to eAthena 15077.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15685 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/common/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index d30a4e714..f7acda740 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -96,7 +96,7 @@ set( COMMON_BASE_SOURCES
"${COMMON_SOURCE_DIR}/timer.c"
"${COMMON_SOURCE_DIR}/utils.c"
CACHE INTERNAL "common_base sources" )
-set( LIBRARIES ${ZLIB_LIBRARIES} )
+set( LIBRARIES ${GLOBAL_LIBRARIES} ${ZLIB_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MT19937AR_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${LIBCONFIG_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS}" )
set( SOURCE_FILES ${MT19937AR_HEADERS} ${MT19937AR_SOURCES} ${COMMON_BASE_HEADERS} ${COMMON_BASE_SOURCES} )
@@ -128,7 +128,7 @@ set( COMMON_SQL_SOURCES
"${CMAKE_CURRENT_SOURCE_DIR}/sql.c"
CACHE INTERNAL "common_sql sources" )
set( DEPENDENCIES common_base )
-set( LIBRARIES ${MYSQL_LIBRARIES} )
+set( LIBRARIES ${GLOBAL_LIBRARIES} ${MYSQL_LIBRARIES} )
set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS}" )
set( SOURCE_FILES ${COMMON_SQL_HEADERS} ${COMMON_SQL_SOURCES} )