From bdb3188141b811e953b76f6717678c3250c0798f Mon Sep 17 00:00:00 2001
From: mc6pac <mc6pac@gmail.com>
Date: Wed, 21 Aug 2019 00:37:37 +0200
Subject: [PATCH] Fix for MPLABX 5.xx

Bugfix to support MPLAB X v5.xx
---
 manifest.mf                                               | 2 +-
 nbproject/platform.properties                             | 2 +-
 .../mc6pac/toolchainCC5X/CC5XSystemIncludeProvider.java   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifest.mf b/manifest.mf
index 6c25246..7c20789 100644
--- a/manifest.mf
+++ b/manifest.mf
@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: true
 OpenIDE-Module: com.github.mc6pac.toolchainCC5X/1
 OpenIDE-Module-Layer: com/github/mc6pac/toolchainCC5X/layer.xml
 OpenIDE-Module-Localizing-Bundle: com/github/mc6pac/toolchainCC5X/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1.1
+OpenIDE-Module-Specification-Version: 1.1.2
 
diff --git a/nbproject/platform.properties b/nbproject/platform.properties
index bc25b29..0d53243 100644
--- a/nbproject/platform.properties
+++ b/nbproject/platform.properties
@@ -8,4 +8,4 @@ cluster.path=\
     ${nbplatform.active.dir}/mplab_ide:\
     ${nbplatform.active.dir}/nb:\
     ${nbplatform.active.dir}/platform
-nbplatform.active=MPLAB_X_IDE_v3.40
+nbplatform.active=MPLAB_X_IDE_v5.10
diff --git a/src/com/github/mc6pac/toolchainCC5X/CC5XSystemIncludeProvider.java b/src/com/github/mc6pac/toolchainCC5X/CC5XSystemIncludeProvider.java
index aa53a6b..86528ac 100644
--- a/src/com/github/mc6pac/toolchainCC5X/CC5XSystemIncludeProvider.java
+++ b/src/com/github/mc6pac/toolchainCC5X/CC5XSystemIncludeProvider.java
@@ -5,9 +5,8 @@
  */
 package com.github.mc6pac.toolchainCC5X;
 
-import com.microchip.mplab.nbide.embedded.makeproject.api.configurations.MakeConfiguration;
 import com.microchip.mplab.nbide.embedded.spi.IncludeProvider;
-import com.microchip.mplab.nbide.toolchainCommon.LTUtils;
+import com.microchip.mplab.nbide.toolchainCommon.properties.CommonLanguageToolchainPropertiesUtils;
 import java.util.ArrayList;
 import java.util.List;
 import org.netbeans.api.project.Project;
@@ -15,12 +14,13 @@
 
 public class CC5XSystemIncludeProvider implements IncludeProvider {
 
+    private final CommonLanguageToolchainPropertiesUtils utils = new CommonLanguageToolchainPropertiesUtils();
+
     @Override
     public List<String> getIncludes(Project project, ProjectConfiguration projectConf, String itemPath) {
-        MakeConfiguration makeConf = (MakeConfiguration)projectConf;
 
         final List<String> ret = new ArrayList<>();
-        final String pathToBin = LTUtils.pathToBin(projectConf);
+        final String pathToBin = utils.pathToBin(projectConf);
 
         ret.add(pathToBin);