github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

MySql, PGSQL: now using pkg-config

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14450 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-05-10 15:37:43 +00:00
parent 980530f31c
commit d3349a53c8
3 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppsrc/MySql/MySql.h
View file

@ -11,16 +11,9 @@
#ifndef IPPROTO_IP
#include <winsock2.h>
#endif
#include <mysql.h>
#endif
#ifdef PLATFORM_POSIX
#ifdef PLATFORM_OSX
#include <mysql.h>
#else
#include <mysql/mysql.h>
#endif
#endif
namespace Upp {

12
uppsrc/MySql/MySql.upp
View file

@ -10,19 +10,9 @@ uses
library(WIN32) libmysql.lib;
library(LINUX !MT) "mysqlclient ssl";
library(LINUX MT) "mysqlclient_r ssl";
library(FREEBSD) mysqlclient;
library(OSX) mysqlclient;
link(DEBUG SO) /nodefaultlib:LIBCD;
link(SHARED SO) /nodefaultlib:LIBCMT;
link(FREEBSD) -L/usr/local/lib/mysql;
pkg_config(LINUX | FREEBSD | OPENBSD) mysqlclient;
file
MySql.h,

2
uppsrc/PostgreSQL/PostgreSQL.upp
View file

@ -6,7 +6,7 @@ uses
library(WIN32) libpq.lib;
library(POSIX) pq;
pkg_config(LINUX | FREEBSD | OPENBSD) libpq;
file
PostgreSQL.h,