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

ide: Win32 autosetup of include PGSQL library

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12731 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-02-02 14:47:28 +00:00
parent 724483ac56
commit 9a890cd015
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/PostgreSQL/PostgreSQL.upp
View file

@ -6,7 +6,7 @@ uses
library(WIN32 !NOPOSTGRESQL MSC) libpq;
library(WIN32 !NOPOSTGRESQL GCC) pq;
library(WIN32 !NOPOSTGRESQL GCC) libpq.dll;
library(POSIX !NOPOSTGRESQL) pq;

25
uppsrc/ide/InstantSetup.cpp
View file

@ -136,7 +136,7 @@ void InstantSetup()
String method = x86method + x64s;
String builder = (version == VS_2015 ? "MSC15" : "MSC17") + ToUpper(x64s);
#ifdef _DEBUG
#ifdef _DEBUG0
method << "Test";
#endif
@ -190,7 +190,11 @@ void InstantSetup()
String& sdlbin = bins.At(3);
if(IsNull(sdlbin) || ToLower(sdlbin).Find("sdl2") >= 0)
sdlbin = GetExeDirFile(x64 ? "bin/SDL2/lib/x64" : "bin/SDL2\\lib\\x86");
sdlbin = GetExeDirFile(x64 ? "bin/SDL2/lib/x64" : "bin/SDL2/lib/x86");
String& pgbin = bins.At(4);
if(IsNull(pgbin) || ToLower(pgbin).Find("pgsql") >= 0)
pgbin = GetExeDirFile(x64 ? "bin/pgsql/x64/bin" : "bin/pgsql/x86/bin");
incs.At(0) = vc + "/include";
int ii = 1;
@ -212,6 +216,10 @@ void InstantSetup()
String& sdlinc = incs.At(5);
if(IsNull(sdlinc) || ToLower(sdlinc).Find("sdl2") >= 0)
sdlinc = GetExeDirFile("bin/SDL2/include");
String& pginc = incs.At(6);
if(IsNull(pginc) || ToLower(pginc).Find("pgsql") >= 0)
pginc = GetExeDirFile(x64 ? "bin/pgsql/x64/include" : "bin/pgsql/x86/include");
libs.At(0) = vc + (ver17 ? (x64 ? "/lib/x64" : "/lib/x86") : (x64 ? "/lib/amd64" : "/lib"));
ii = 1;
@ -228,7 +236,11 @@ void InstantSetup()
String& sdllib = libs.At(4);
if(IsNull(sdllib) || ToLower(sdllib).Find("sdl2") >= 0)
sdllib = GetExeDirFile(x64 ? "bin/SDL2/lib/x64" : "bin/SDL2\\lib\\x86");
sdllib = GetExeDirFile(x64 ? "bin/SDL2/lib/x64" : "bin/SDL2/lib/x86");
String& pglib = libs.At(5);
if(IsNull(pglib) || ToLower(pglib).Find("pgsql") >= 0)
pglib = GetExeDirFile(x64 ? "bin/pgsql/x64/lib" : "bin/pgsql/x86/lib");
bm.GetAdd("BUILDER") = builder;
bmSet(bm, "COMPILER", "");
@ -317,15 +329,18 @@ void InstantSetup()
bins.At(0) = binx + "/bin";
bins.At(1) = binx + "/opt/bin";
bins.At(2) = binx + "/gdb/bin";
bins.At(3) = GetExeDirFile(x64 ? "bin/SDL2/lib/x64" : "bin/SDL2\\lib\\x86");
bins.At(3) = GetExeDirFile(x64 ? "bin/SDL2/lib/x64" : "bin/SDL2/lib/x86");
bins.At(4) = GetExeDirFile(x64 ? "bin/pgsql/x64/bin" : "bin/pgsql/x86/bin");
incs.At(0) = mingw + "/include";
incs.At(1) = binx + "/opt/include";
incs.At(2) = GetExeDirFile("bin/SDL2/include");
incs.At(3) = GetExeDirFile(x64 ? "bin/pgsql/x64/include" : "bin/pgsql/x86/include");
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(2) = GetExeDirFile(x64 ? "bin/SDL2/lib/x64" : "bin/SDL2/lib/x86");
libs.At(3) = GetExeDirFile(x64 ? "bin/pgsql/x64/bin" : "bin/pgsql/x86/bin");
bm.GetAdd("PATH") = Join(bins, ";");
bm.GetAdd("INCLUDE") = Join(incs, ";");