diff options
| author | Kudlaty <none@none> | 2009-07-12 04:32:34 +0200 |
|---|---|---|
| committer | Kudlaty <none@none> | 2009-07-12 04:32:34 +0200 |
| commit | 63fd4eda9923dd987b766e3a11291627e494d2e6 (patch) | |
| tree | a156219cc1fc76c8da3e5509bdd2a7e6d83078a8 /src | |
| parent | bda2a721fa777bd1e1ab146036fb6144b09efadc (diff) | |
Some work on PostgreSQL support
note: still don't work, so use mysql
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/Database/QueryResultPostgre.h | 4 | ||||
| -rw-r--r-- | src/trinitycore/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/trinityrealm/CMakeLists.txt | 7 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/shared/Database/QueryResultPostgre.h b/src/shared/Database/QueryResultPostgre.h index 30d69114dc6..a48c6d21fee 100644 --- a/src/shared/Database/QueryResultPostgre.h +++ b/src/shared/Database/QueryResultPostgre.h @@ -25,10 +25,12 @@ #define FD_SETSIZE 1024 #include <winsock2.h> #include <postgre/libpq-fe.h> +#include <postgre/postgres.h> #include <postgre/pg_type.h> #else #include <libpq-fe.h> -//#include <pg_type.h> +#include <postgres.h> +#include <catalog/pg_type.h> #endif class QueryResultPostgre : public QueryResult diff --git a/src/trinitycore/CMakeLists.txt b/src/trinitycore/CMakeLists.txt index 7eb13185d91..ffd8e6431c4 100644 --- a/src/trinitycore/CMakeLists.txt +++ b/src/trinitycore/CMakeLists.txt @@ -22,6 +22,9 @@ add_definitions( IF (DO_MYSQL) SET(trinity-core_LINK_FLAGS "-pthread ${trinity-core_LINK_FLAGS}") ENDIF(DO_MYSQL) +IF (DO_POSTGRESQL) + SET(trinity-core_LINK_FLAGS "-pthread ${trinity-core_LINK_FLAGS}") +ENDIF(DO_POSTGRESQL) IF (CMAKE_SYSTEM_NAME MATCHES "Darwin") @@ -48,7 +51,7 @@ readline gomp ${SCRIPT_LIB} ${MYSQL_LIBRARIES} -${POSTGRE_LIBS} +${POSTGRESQL_LIBRARIES} ${SSLLIB} ${ACE_LIBRARY} ${ZLIB} diff --git a/src/trinityrealm/CMakeLists.txt b/src/trinityrealm/CMakeLists.txt index 62f943a1c96..dc5b67c7798 100644 --- a/src/trinityrealm/CMakeLists.txt +++ b/src/trinityrealm/CMakeLists.txt @@ -18,9 +18,9 @@ add_definitions( IF (DO_MYSQL) SET(trinity-realm_LINK_FLAGS "-pthread ${trinity-realm_LINK_FLAGS}") ENDIF(DO_MYSQL) -IF (DO_POSTGRE) - SET(trinity-realm_LINK_FLAGS "${POSTGRE_LIBS} ${trinity-realm_LINK_FLAGS}") -ENDIF(DO_POSTGRE) +IF (DO_POSTGRESQL) + SET(trinity-realm_LINK_FLAGS "-pthread ${trinity-realm_LINK_FLAGS}") +ENDIF(DO_POSTGRESQL) IF (CMAKE_SYSTEM_NAME MATCHES "Darwin") SET(trinity-realm_LINK_FLAGS "-framework Carbon ${trinity-realm_LINK_FLAGS}") @@ -41,6 +41,7 @@ zlib gomp ${SSLLIB} ${MYSQL_LIBRARIES} +${POSTGRESQL_LIBRARIES} ${OSX_LIBS} ) |