fixes merge to master

Author: d3cod3

README.md

@@ -391,6 +391,11 @@ ofxBTrack original addon by [Nao Tokui](https://github.com/naotokui)
 ofxChromaKeyShader original addon by [Eric Koo](https://github.com/musiko)
 
 ofxCv original addons by [Kyle McDonald](https://github.com/kylemcdonald)
+<<<<<<< HEAD
+=======
+
+ofxDatGui, ofxParagraph original addons by [Stephen Braitsch](https://github.com/braitsch)
+>>>>>>> master
 
 ofxEasing original addon by [Arturo Castro](https://github.com/arturoc)
 

addon_config.mk

@@ -26,9 +26,14 @@ common:
 	# or use += in several lines
         ADDON_DEPENDENCIES = ofxAssimpModelLoader ofxGui ofxKinect ofxNetwork ofxOpenCv ofxOsc ofxSvg ofxVectorGraphics ofxXmlSettings
         ADDON_DEPENDENCIES += ofxAudioAnalyzer ofxAudioFile ofxBTrack ofxChromaKeyShader ofxCv ofxEasing ofxFFmpegRecorder ofxFontStash ofxGLEditor
+<<<<<<< HEAD
         ADDON_DEPENDENCIES += ofxJSON ofxInfiniteCanvas ofxLua ofxMidi ofxMtlMapping2D
         ADDON_DEPENDENCIES += ofxPDSP ofxTimeline ofxWarp
         ADDON_DEPENDENCIES += ofxImGui
+=======
+        ADDON_DEPENDENCIES += ofxDatGui ofxHistoryPlot ofxJSON ofxInfiniteCanvas ofxLua ofxMidi ofxMtlMapping2D ofxParagraph
+        ADDON_DEPENDENCIES += ofxPDSP ofxThreadedFileDialog ofxTimeline ofxTimeMeasurements ofxWarp
+>>>>>>> master
 
 	# include search paths, this will be usually parsed from the file system
 	# but if the addon or addon libraries need special search paths they can be
@@ -73,10 +78,20 @@ common:
 	# ADDON_INCLUDES_EXCLUDE =
 
 linux64:
+<<<<<<< HEAD
         ADDON_DEPENDENCIES += ofxPd ofxPdExternals ofxPython ofxNDI
 
 msys2:
         ADDON_SOURCES_EXCLUDE = src/objects/scripting/BashScript% src/objects/scripting/PythonScript% src/objects/sound/PDPatch% src/objects/video/VideoSender% src/objects/video/VideoReceiver%
 
 osx:
         ADDON_DEPENDENCIES += ofxPd ofxPdExternals ofxPython ofxNDI
+=======
+        ADDON_DEPENDENCIES += ofxJava ofxPd ofxPdExternals ofxPython ofxNDI
+
+msys2:
+        ADDON_SOURCES_EXCLUDE = src/objects/scripting/BashScript% src/objects/scripting/ProcessingScript% src/objects/scripting/PythonScript% src/objects/sound/PDPatch% src/objects/video/VideoSender% src/objects/video/VideoReceiver%
+
+osx:
+        ADDON_DEPENDENCIES += ofxJava ofxPd ofxPdExternals ofxPython ofxNDI
+>>>>>>> master

src/objects/scripting/PythonScript.cpp

@@ -32,7 +32,11 @@
 
 #if defined(TARGET_WIN32)
     // Unavailable on windows.
+<<<<<<< HEAD
 #elif !defined(OFXVP_BUILD_WITH_MINIMAL_OBJECTS)
+=======
+#else
+>>>>>>> master
 
 #include "PythonScript.h"
 

src/objects/scripting/PythonScript.h

@@ -36,6 +36,10 @@
 
 #pragma once
 
+#if defined(TARGET_WIN32)
+    // Unavailable on windows.
+#else
+
 #include "PatchObject.h"
 
 #include "ofxPython.h"

src/objects/sound/PDPatch.cpp

@@ -32,7 +32,11 @@
 
 #if defined(TARGET_WIN32)
     // Unavailable on windows.
+<<<<<<< HEAD
 #elif !defined(OFXVP_BUILD_WITH_MINIMAL_OBJECTS)
+=======
+#else
+>>>>>>> master
 
 #include "PDPatch.h"
 

src/objects/sound/PDPatch.h

@@ -32,7 +32,11 @@
 
 #if defined(TARGET_WIN32)
     // Unavailable on windows.
+<<<<<<< HEAD
 #elif !defined(OFXVP_BUILD_WITH_MINIMAL_OBJECTS)
+=======
+#else
+>>>>>>> master
 
 #pragma once
 
@@ -42,9 +46,7 @@
 #include "IconsFontAwesome5.h"
 
 #include "ofxPd.h"
-#if defined(TARGET_LINUX) || defined(TARGET_OSX)
-    #include "ofxPdExternals.h"
-#endif
+#include "ofxPdExternals.h"
 
 
 using namespace pd;