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

upp.src: Fixed mysql, sdl2, pgsql linking with mingw

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14037 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-02-18 22:31:56 +00:00
parent 1a1bffefda
commit 6e167cdfdb
4 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/src.tpp/MacOSMenu_en-us.tpp
View file

@ -12,7 +12,7 @@ topic "";
[{_}%EN-US
[ {{10000@(113.42.0) [s0; [*@7;4 MacOS menu support]]}}&]
[s0; &]
[s0; U`+`+ applications wihout changes to support MacOS application
[s0; U`+`+ applications without changes to support MacOS application
menu will run with menu inside the window.&]
[s0; &]
[s0; To properly support MacOS menu, application needs to provide

6
uppsrc/MySql/MySql.upp
View file

@ -8,9 +8,7 @@ uses
Sql,
plugin\z;
library(WIN32 !NOMYSQL MSC) libmysql;
library(WIN32 GCC !NOMYSQL) libmysql.dll;
library(WIN32) libmysql.lib;
library(LINUX !MT) "mysqlclient ssl";
@ -20,8 +18,6 @@ library(FREEBSD) mysqlclient;
library(OSX) mysqlclient;
link(WIN32 GCC !NOMYSQL) "-Wl,--enable-stdcall-fixup";
link(DEBUG SO) /nodefaultlib:LIBCD;
link(SHARED SO) /nodefaultlib:LIBCMT;

6
uppsrc/PostgreSQL/PostgreSQL.upp
View file

@ -4,11 +4,9 @@ acceptflags
uses
Sql;
library(WIN32 !NOPOSTGRESQL MSC) libpq;
library(WIN32) libpq.lib;
library(WIN32 !NOPOSTGRESQL GCC) libpq.dll;
library(POSIX !NOPOSTGRESQL) pq;
library(POSIX) pq;
file
PostgreSQL.h,

2
uppsrc/ide/InstantSetup.cpp
View file

@ -367,7 +367,7 @@ void InstantSetup()
libs.At(0) = mingw + "/lib";
libs.At(1) = binx + "/opt/lib";
libs.At(2) = GetExeDirFile(x64 ? "bin/SDL2/lib/x64" : "bin/SDL2/lib/x86");
libs.At(3) = GetExeDirFile(x64 ? "bin/pgsql/x64/bin" : "bin/pgsql/x86/bin");
libs.At(3) = GetExeDirFile(x64 ? "bin/pgsql/x64/lib" : "bin/pgsql/x86/lib");
libs.At(4) = GetExeDirFile(x64 ? "bin/mysql/lib64" : "bin/mysql/lib32");
bm.GetAdd("PATH") = Join(bins, ";");