github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: MINGW setup optimized

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9579 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-03-07 10:17:01 +00:00
parent 34e2a59e06
commit 52e5d94926
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Path.h
View file

@ -38,7 +38,9 @@ String GetFullPath(const char *path);
String GetCurrentDirectory();
#endif
#ifdef PLATFORM_POSIX
bool SetCurrentDirectory(const char *path);
#endif
struct FileTime;

4
uppsrc/ide/Builders/GccBuilder.icpp
View file

@ -91,7 +91,7 @@ bool GccBuilder::BuildPackage(const String& package, Vector<String>& linkfile, V
if(ext == ".a" || ext == ".so")
linkfile.Add(fn);
else
if(IsHeaderExt(ext) && pkg[i].pch && allow_pch && release && !HasAnyDebug() && !blitz) {
if(IsHeaderExt(ext) && pkg[i].pch && allow_pch && !blitz) {
if(pch_header.GetCount())
PutConsole(GetFileName(fn) + ": multiple PCHs are not allowed. Check your package configuration");
else
@ -473,7 +473,7 @@ bool GccBuilder::Link(const Vector<String>& linkfile, const String& linkoptions,
lnk << " -o " << GetHostPathQ(target);
if(createmap)
lnk << " -Wl,-Map," << GetHostPathQ(GetFileDirectory(target) + GetFileTitle(target) + ".map");
if(HasFlag("DEBUG") || HasFlag("DEBUG_MINIMAL") || HasFlag("DEBUG_FULL"))
if(HasFlag("DEBUG_MINIMAL") || HasFlag("DEBUG_FULL"))
lnk << " -ggdb";
else
lnk << (!HasFlag("OSX11") ? " -Wl,-s" : "");

8
uppsrc/ide/InstantSetup.cpp
View file

@ -219,23 +219,25 @@ void InstantSetup()
Vector<String> bins = Split(bm.Get("PATH", ""), ';');
Vector<String> incs = Split(bm.Get("INCLUDE", ""), ';');
Vector<String> libs = Split(bm.Get("LIB", ""), ';');
#ifndef _DEBUG
if(CheckDirs(bins, 3) && CheckDirs(incs, 2) && CheckDirs(libs, 2)) {
if(!x64)
default_method = Nvl(default_method, method);
continue;
}
#endif
bmSet(bm, "BUILDER", "GCC");
bmSet(bm, "COMPILER", "");
bmSet(bm, "COMMON_OPTIONS", "-msse2 -D__CRT__NO_INLINE");
bmSet(bm, "COMMON_CPP_OPTIONS", "-std=c++14");
bmSet(bm, "COMMON_C_OPTIONS", "");
bmSet(bm, "COMMON_LINK", x64 ? "" : "-m32");
bmSet(bm, "COMMON_LINK", "");
bmSet(bm, "COMMON_FLAGS", "");
bmSet(bm, "DEBUG_INFO", "2");
bmSet(bm, "DEBUG_BLITZ", "1");
bmSet(bm, "DEBUG_BLITZ", "");
bmSet(bm, "DEBUG_LINKMODE", "0");
bmSet(bm, "DEBUG_OPTIONS", "-O0 -ggdb");
bmSet(bm, "DEBUG_OPTIONS", "-Os");
bmSet(bm, "DEBUG_FLAGS", "");
bmSet(bm, "DEBUG_LINK", "");
bmSet(bm, "RELEASE_BLITZ", "");