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

Allow to specify custom platform flags (and create Makefiles for other platforms than the current running one or Linux when using snapshots)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@10778 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
amrein 2017-01-27 23:11:09 +00:00
parent 1f54e4594e
commit 94f09e3d5c
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppbox/Scripts/domake
View file

@ -345,7 +345,7 @@ log_debug_info "Configuring uppsrc/Makefile, uppsrc/uMakefile, GCC.bm and CLANG.
if which pkg-config
then
if [[ "$Macro" == *"-DflagNOGTK"* ]]
if [[ "$Macro" = *"-DflagNOGTK"* ]]
then
requires_libraries="x11 libnotify freetype2"
else
@ -387,7 +387,7 @@ then
fi
if [[ "$Macro" == *"-DflagNOGTK"* ]]
if [[ "$Macro" = *"-DflagNOGTK"* ]]
then
log_debug_info "Removing references to GTK+"
sed -i.backup \

8
uppsrc/ide/Core/Host.cpp
View file

@ -315,6 +315,12 @@ void LocalHost::Launch(const char *_cmdline, bool console)
void LocalHost::AddFlags(Index<String>& cfg)
{
// Allow to specify custom platform flags
for (const String& config : cfg)
if(findarg(config, "WIN32", "LINUX", "POSIX", "BSD", "FREEBSD", \
"OPENBSD", "NETBSD", "DRAGONFLY", "SOLARIS", "OSX11") >= 0)
return;
#if defined(PLATFORM_WIN32)
cfg.Add("WIN32");
#endif
@ -597,4 +603,4 @@ void RemoteHost::AddFlags(Index<String>& cfg)
{
cfg.Add(os_type);
}
#endif
#endif