merge conflicts fixes

Author: d3cod3

README.md

@@ -391,11 +391,6 @@ 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

@@ -15,25 +15,20 @@
 # and the PG will write to the console the kind of error and in which line it is
 
 meta:
-	ADDON_NAME = ofxVisualProgramming
-	ADDON_DESCRIPTION = A visual programming patching environment for OF
-	ADDON_AUTHOR = Emanuele Mazza
-    ADDON_TAGS = "visual programming" "visual patching" "cyber-transmedia programming"
+        ADDON_NAME = ofxVisualProgramming
+        ADDON_DESCRIPTION = A visual programming patching environment for OF
+        ADDON_AUTHOR = Emanuele Mazza
+        ADDON_TAGS = "visual programming" "visual patching" "cyber-transmedia programming"
 	ADDON_URL = http://github.com/d3cod3/ofxVisualProgramming
 
 common:
 	# dependencies with other addons, a list of them separated by spaces
 	# 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
@@ -77,21 +72,12 @@ common:
 	# a specific platform
 	# 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,11 +32,8 @@
 
 #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,10 +36,6 @@
 
 #pragma once
 
-#if defined(TARGET_WIN32)
-    // Unavailable on windows.
-#else
-
 #include "PatchObject.h"
 
 #include "ofxPython.h"

src/objects/sound/PDPatch.cpp

@@ -32,11 +32,7 @@
 
 #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,11 +32,7 @@
 
 #if defined(TARGET_WIN32)
     // Unavailable on windows.
-<<<<<<< HEAD
 #elif !defined(OFXVP_BUILD_WITH_MINIMAL_OBJECTS)
-=======
-#else
->>>>>>> master
 
 #pragma once