From 025c618f08a36bd8a4564dfd158251ac9cdf0bbf Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 7 Feb 2021 18:11:44 +0000
Subject: [PATCH] umk2: Fixed umk32

git-svn-id: svn://ultimatepp.org/upp/trunk@15747 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Core.h               | 4 ++++
 uppsrc/Draw/Draw.upp             | 2 ++
 uppsrc/ide/Builders/Builders.upp | 8 +++++---
 uppsrc/ide/idebar.cpp            | 1 +
 uppsrc/umk/umk.upp               | 3 ++-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/uppsrc/Core/Core.h b/uppsrc/Core/Core.h
index d8198ad4a..89dd68d07 100644
--- a/uppsrc/Core/Core.h
+++ b/uppsrc/Core/Core.h
@@ -285,6 +285,10 @@ class JsonIO;
 	#endif
 #endif
 
+#if defined(CPU_SSE2) && defined(CPU_32) && defined(PLATFORM_POSIX)
+#undef CPU_SSE2
+#endif
+
 #ifdef CPU_SSE2
 #include "SIMD_SSE2.h"
 #define CPU_SIMD 1
diff --git a/uppsrc/Draw/Draw.upp b/uppsrc/Draw/Draw.upp
index 3f7611ebc..883e268a9 100644
--- a/uppsrc/Draw/Draw.upp
+++ b/uppsrc/Draw/Draw.upp
@@ -12,6 +12,8 @@ library(WIN32) "user32 gdi32";
 
 link(OSX !X11) "-framework Foundation -framework Cocoa -framework Carbon";
 
+pkg_config(POSIX !NOSO) "freetype2 x11 fontconfig xcb expat";
+
 pkg_config(POSIX !OSX) "freetype2 x11 fontconfig xcb expat";
 
 file
diff --git a/uppsrc/ide/Builders/Builders.upp b/uppsrc/ide/Builders/Builders.upp
index c427728f7..3ed9f3650 100644
--- a/uppsrc/ide/Builders/Builders.upp
+++ b/uppsrc/ide/Builders/Builders.upp
@@ -6,9 +6,11 @@ uses
 	ide\Core,
 	ide/Android,
 	ide/Java,
-	ide/Android,
-	plugin/png,
-	Draw;
+	ide/Android;
+
+uses(!NOSO) plugin/png;
+
+uses(!NOSO) Draw;
 
 file
 	Builders.h options(BUILDER_OPTION) PCH,
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 8f421858f..71bf70600 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -391,6 +391,7 @@ void Ide::Setup(Bar& menu)
 		if(SetupSVNTrunk()) {
 			IdeAgain = true;
 			Break();
+			
 		}
 	});
 
diff --git a/uppsrc/umk/umk.upp b/uppsrc/umk/umk.upp
index 09077fb49..521c8a536 100644
--- a/uppsrc/umk/umk.upp
+++ b/uppsrc/umk/umk.upp
@@ -12,5 +12,6 @@ file
 	umake.cpp;
 
 mainconfig
-	"" = "";
+	"" = "",
+	"" = "NOSO";