Arduino: fix build

This commit is contained in:
Gerasim Troeglazov
2019-07-17 19:51:23 +10:00
parent cc567e6b3d
commit 822ed698f0
5 changed files with 218 additions and 42 deletions

View File

@@ -1,4 +1,4 @@
From f874d3a990ad31b6a50c2b0696cfe4faabdc0b22 Mon Sep 17 00:00:00 2001
From be2b430a99273bcbab22f716fb33a07ea8ee2be8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 11 Jun 2015 18:25:51 +1000
Subject: Use JFileChooser instead of FileDialog for open files
@@ -84,10 +84,10 @@ index ca8d13c..a937988 100644
// now do the work of adding the file
boolean result = addFile(sourceFile);
--
2.7.0
2.21.0
From d55081ebf35f57b0055f3d3f21602bc9e888e5cf Mon Sep 17 00:00:00 2001
From a94ad93405daab4738a230691c4428d58187307e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 7 Apr 2017 00:31:04 +0000
Subject: Use JFileChooser instead of FileDialog for save
@@ -142,5 +142,36 @@ index a937988..23fe2c4 100644
File newFolder = new File(newParentDir, newName);
--
2.7.0
2.21.0
From eeab0c20120f4b45baa9fdeabc2d444371202485 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 17 Jul 2019 19:39:27 +1000
Subject: Fix build
diff --git a/Base.java b/Base.java
index f0e5e0d..8980f98 100644
--- a/Base.java
+++ b/Base.java
@@ -31,7 +31,6 @@ import processing.app.helpers.filefilters.OnlyDirs;
import processing.app.helpers.filefilters.OnlyFilesWithExtension;
import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
import processing.app.legacy.PApplet;
-import processing.app.macosx.ThinkDifferent;
import processing.app.packages.Library;
import processing.app.packages.LibraryList;
import processing.app.tools.MenuScroller;
@@ -199,8 +198,6 @@ public class Base {
public Base(String[] args) throws Exception {
getPlatform().init();
- if (OSUtils.isMacOS())
- ThinkDifferent.init(this);
String sketchbookPath = BaseNoGui.getSketchbookPath();
--
2.21.0

View File

@@ -1,4 +1,4 @@
From 28c4ea802381f2ebc3955215720bf684edf7d916 Mon Sep 17 00:00:00 2001
From 25fc9bd1d8880fcbc1f26d8c521e20ccdb468f42 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 10 Jun 2015 23:31:37 +1000
Subject: Add binary launcher
@@ -419,10 +419,10 @@ index 0000000..b795392
+};
+
--
2.7.0
2.21.0
From da067783d7fe50a05351a344d1c9cd2cd45816ee Mon Sep 17 00:00:00 2001
From 1555ad1aeae85e15427d5ecad337e6af11603e49 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 7 Apr 2017 00:37:59 +0000
Subject: Cleanup code and set actual version
@@ -465,5 +465,5 @@ index b795392..f174d8b 100644
variety = B_APPV_DEVELOPMENT,
internal = 0,
--
2.7.0
2.21.0