Modular extensions: now properly link to Modular instead of multiply …

…including source files from the lib -- CMake files will need to be updated. see #341.
jamoma · Mar 4, 2015 · d88c1b1 · d88c1b1
1 parent a28ce18
commit d88c1b1
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 90 deletions.
diff --git a/Modular/extensions/MIDI/MIDI.xcodeproj/project.pbxproj b/Modular/extensions/MIDI/MIDI.xcodeproj/project.pbxproj
@@ -25,8 +25,6 @@
 		46A30BBB19AD214300223A7D /* portmidi_s.pdb */ = {isa = PBXFileReference; lastKnownFileType = file; path = portmidi_s.pdb; sourceTree = "<group>"; };
 		46A30BBD19AD214300223A7D /* libportmidi_s_jamoma.lib */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libportmidi_s_jamoma.lib; sourceTree = "<group>"; };
 		46A30BBE19AD214300223A7D /* portmidi_s.idb */ = {isa = PBXFileReference; lastKnownFileType = file; path = portmidi_s.idb; sourceTree = "<group>"; };
-		46A30BC019AD21E300223A7D /* Protocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Protocol.cpp; sourceTree = "<group>"; };
-		46A30BC119AD21E300223A7D /* Protocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Protocol.h; sourceTree = "<group>"; };
 		46A30BC419AD223100223A7D /* MIDIInclude.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MIDIInclude.h; sourceTree = "<group>"; };
 		46A30BC519AD26C700223A7D /* MIDIInput.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MIDIInput.h; sourceTree = "<group>"; };
 		46A30BC619AD26CE00223A7D /* MIDIInput.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MIDIInput.cpp; sourceTree = "<group>"; };
@@ -45,7 +43,6 @@
 			isa = PBXGroup;
 			children = (
 				46A30BAB19AD212300223A7D /* MIDI.yml */,
-				46A30BBF19AD21E300223A7D /* ProtocolLib */,
 				46A30BA719AD210E00223A7D /* includes */,
 				46A30BA919AD211C00223A7D /* source */,
 				46A30BAC19AD214300223A7D /* portmidi */,
@@ -142,16 +139,6 @@
 			path = Release_;
 			sourceTree = "<group>";
 		};
-		46A30BBF19AD21E300223A7D /* ProtocolLib */ = {
-			isa = PBXGroup;
-			children = (
-				46A30BC119AD21E300223A7D /* Protocol.h */,
-				46A30BC019AD21E300223A7D /* Protocol.cpp */,
-			);
-			name = ProtocolLib;
-			path = ../../library/ProtocolLib;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXLegacyTarget section */

diff --git a/Modular/extensions/MIDI/MIDI.yml b/Modular/extensions/MIDI/MIDI.yml
@@ -1,8 +1,8 @@
-#defines:
+defines:
+  - TT_NO_DSP	
 #  - TT_PROTOCOL_DEBUG
 
-sources:
-  - ../../library/ProtocolLib/Protocol.cpp		
+sources:		
   - source/MIDI.cpp
   - source/MIDIDestination.cpp
   - source/MIDIInput.cpp
@@ -15,11 +15,12 @@ includes:
   - "."
   - "includes"
   - "../../../Graph/extensions/MidiLib/portmidi/pm_common"
-  - "../../library/ProtocolLib"
+  - "../../library/includes"
   - "../../../Foundation/library/includes"
 
 libraries:
   - FOUNDATION
+  - MODULAR
   - mac "../../../Graph/extensions/MidiLib/portmidi/libportmidi-jamoma.a"
   - win "../../../Graph/extensions/MidiLib/portmidi/pm_win_static_lib/Release_/libportmidi_s_jamoma.lib"
   - win winmm.lib

diff --git a/Modular/extensions/Max/Max.xcodeproj/project.pbxproj b/Modular/extensions/Max/Max.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXFileReference section */
+		22609AA21AA73FE6008DF31A /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		22609AA31AA73FE6008DF31A /* Max.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = Max.yml; sourceTree = "<group>"; };
 		46A6E85216CA83FB002E6A40 /* Max.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Max.h; sourceTree = "<group>"; };
 		46A6E85516CA8401002E6A40 /* Max.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Max.cpp; sourceTree = "<group>"; };
 		46A6E86416CABFEB002E6A40 /* Scheduler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Scheduler.cpp; sourceTree = "<group>"; };
@@ -17,6 +19,8 @@
 		46A6E84116CA83C6002E6A40 = {
 			isa = PBXGroup;
 			children = (
+				22609AA21AA73FE6008DF31A /* Makefile */,
+				22609AA31AA73FE6008DF31A /* Max.yml */,
 				46A6E85616CA840D002E6A40 /* SchedulerLib */,
 				46A6E85116CA83FB002E6A40 /* includes */,
 				46A6E85416CA8401002E6A40 /* source */,

diff --git a/Modular/extensions/Max/Max.yml b/Modular/extensions/Max/Max.yml
@@ -1,20 +1,22 @@
-#defines:
+defines:
+- TT_NO_DSP
 #  - SHEDULER_DEBUG
 
 sources:
-  - ../../library/SchedulerLib/Scheduler.cpp		
+#  - ../../library/SchedulerLib/Scheduler.cpp
   - source/Max.cpp
   - ../../../../Implementations/Max/source/c74support/max-includes/common/commonsyms.cpp
 
 includes:
   - "."
   - "includes"
-  - "../../library/SchedulerLib"
+  - "../../library/includes"
   - "../../../Foundation/library/includes"
   - C74-INCLUDES
 
 libraries:
   - FOUNDATION
+  - MODULAR
   - C74
 
 prefix: ../../../../Implementations/Max/source/c74support/max-includes/macho-prefix.pch

diff --git a/Modular/extensions/Minuit/Minuit.xcodeproj/project.pbxproj b/Modular/extensions/Minuit/Minuit.xcodeproj/project.pbxproj
@@ -10,8 +10,6 @@
 		22AD15D716596523002FD7E3 /* Minuit.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = Minuit.yml; sourceTree = "<group>"; };
 		461D557616A85F04003115C7 /* MinuitSenderManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MinuitSenderManager.cpp; sourceTree = "<group>"; };
 		461D557816A85F0D003115C7 /* MinuitSenderManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MinuitSenderManager.h; sourceTree = "<group>"; };
-		D26DFB7714B208E000417FFE /* Protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Protocol.cpp; sourceTree = "<group>"; };
-		D26DFB7814B208E000417FFE /* Protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Protocol.h; sourceTree = "<group>"; };
 		D2AF80B314A0BA940001E901 /* Minuit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Minuit.h; sourceTree = "<group>"; };
 		D2AF80B414A0BA940001E901 /* MinuitAnswer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MinuitAnswer.h; sourceTree = "<group>"; };
 		D2AF80B514A0BA940001E901 /* MinuitAnswerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MinuitAnswerManager.h; sourceTree = "<group>"; };
@@ -27,23 +25,12 @@
 			isa = PBXGroup;
 			children = (
 				22AD15D716596523002FD7E3 /* Minuit.yml */,
-				D26DFB7614B208E000417FFE /* ProtocolLib */,
 				D2AF80B214A0BA940001E901 /* includes */,
 				D2AF80B814A0BAA00001E901 /* source */,
 			);
 			name = MinuitPlugin;
 			sourceTree = "<group>";
 		};
-		D26DFB7614B208E000417FFE /* ProtocolLib */ = {
-			isa = PBXGroup;
-			children = (
-				D26DFB7814B208E000417FFE /* Protocol.h */,
-				D26DFB7714B208E000417FFE /* Protocol.cpp */,
-			);
-			name = ProtocolLib;
-			path = ../../library/ProtocolLib;
-			sourceTree = SOURCE_ROOT;
-		};
 		D2AF80B214A0BA940001E901 /* includes */ = {
 			isa = PBXGroup;
 			children = (

diff --git a/Modular/extensions/Minuit/Minuit.yml b/Modular/extensions/Minuit/Minuit.yml
@@ -1,8 +1,8 @@
-#defines:
+defines:
+  - TT_NO_DSP	
 #  - TT_PROTOCOL_DEBUG
 
-sources:
-  - ../../library/ProtocolLib/Protocol.cpp		
+sources:	
   - source/Minuit.cpp
   - source/MinuitAnswer.cpp
   - source/MinuitAnswerManager.cpp
@@ -11,9 +11,10 @@ sources:
 includes:
   - "."
   - "includes"
-  - "../../library/ProtocolLib"
+  - "../../library/includes"
   - "../../../../Core/Foundation/library/includes"
 
 libraries:
   - FOUNDATION
+  - MODULAR
   - win winmm.lib
diff --git a/Modular/extensions/OSC/OSC.xcodeproj/project.pbxproj b/Modular/extensions/OSC/OSC.xcodeproj/project.pbxproj
@@ -7,21 +7,22 @@
 	objects = {
 
 /* Begin PBXFileReference section */
+		22609AA41AA743BA008DF31A /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		22609AA51AA743BA008DF31A /* OSC.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = OSC.yml; sourceTree = "<group>"; };
 		4611420716CE79170042A39D /* OSC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSC.h; sourceTree = "<group>"; };
 		4611420816CE79170042A39D /* OSCInclude.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSCInclude.h; sourceTree = "<group>"; };
 		4611420916CE79170042A39D /* OSCSenderManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSCSenderManager.h; sourceTree = "<group>"; };
 		4611420A16CE79170042A39D /* Time2.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Time2.hpp; sourceTree = "<group>"; };
 		4611420D16CE79270042A39D /* OSC.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = OSC.cpp; sourceTree = "<group>"; };
 		4611420E16CE79270042A39D /* OSCSenderManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = OSCSenderManager.cpp; sourceTree = "<group>"; };
-		4611421016CE79350042A39D /* Protocol.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Protocol.cpp; sourceTree = "<group>"; };
-		4611421116CE79350042A39D /* Protocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Protocol.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
 		461141F616CE78D70042A39D = {
 			isa = PBXGroup;
 			children = (
-				4611420F16CE79350042A39D /* ProtocolLib */,
+				22609AA41AA743BA008DF31A /* Makefile */,
+				22609AA51AA743BA008DF31A /* OSC.yml */,
 				4611420616CE79170042A39D /* includes */,
 				4611420C16CE79270042A39D /* source */,
 			);
@@ -47,16 +48,6 @@
 			path = source;
 			sourceTree = "<group>";
 		};
-		4611420F16CE79350042A39D /* ProtocolLib */ = {
-			isa = PBXGroup;
-			children = (
-				4611421116CE79350042A39D /* Protocol.h */,
-				4611421016CE79350042A39D /* Protocol.cpp */,
-			);
-			name = ProtocolLib;
-			path = ../../library/ProtocolLib;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXLegacyTarget section */

diff --git a/Modular/extensions/OSC/OSC.yml b/Modular/extensions/OSC/OSC.yml
@@ -1,16 +1,17 @@
-#defines:
+defines:
+  - TT_NO_DSP	
 #  - TT_PROTOCOL_DEBUG
 
 sources:
-  - ../../library/ProtocolLib/Protocol.cpp		
   - source/OSC.cpp
   - source/OSCSenderManager.cpp
 
 includes:
   - "."
   - "includes"
-  - "../../library/ProtocolLib"
+  - "../../library/includes"
   - "../../../../Core/Foundation/library/includes"
 
 libraries:
   - FOUNDATION
+  - MODULAR
diff --git a/Modular/extensions/System/System.xcodeproj/project.pbxproj b/Modular/extensions/System/System.xcodeproj/project.pbxproj
@@ -9,15 +9,12 @@
 /* Begin PBXFileReference section */
 		46F4622116F127DF0092840F /* System.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = System.cpp; sourceTree = "<group>"; };
 		46F4622316F127E90092840F /* System.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = System.h; sourceTree = "<group>"; };
-		46F4622516F128510092840F /* Scheduler.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Scheduler.cpp; sourceTree = "<group>"; };
-		46F4622616F128510092840F /* Scheduler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Scheduler.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
 		46F4621316F127C10092840F = {
 			isa = PBXGroup;
 			children = (
-				46F4622416F128510092840F /* SchedulerLib */,
 				46F4622216F127E90092840F /* includes */,
 				46F4621E16F127DF0092840F /* source */,
 			);
@@ -39,16 +36,6 @@
 			path = includes;
 			sourceTree = "<group>";
 		};
-		46F4622416F128510092840F /* SchedulerLib */ = {
-			isa = PBXGroup;
-			children = (
-				46F4622616F128510092840F /* Scheduler.h */,
-				46F4622516F128510092840F /* Scheduler.cpp */,
-			);
-			name = SchedulerLib;
-			path = ../../library/SchedulerLib;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXLegacyTarget section */

diff --git a/Modular/extensions/System/System.yml b/Modular/extensions/System/System.yml
@@ -1,16 +1,17 @@
-#defines:
+defines:
+  - TT_NO_DSP	
 #  - SHEDULER_DEBUG
 
 sources:
-  - ../../library/SchedulerLib/Scheduler.cpp
   - source/System.cpp
 
 includes:
   - "."
   - "includes"
-  - "../../library/SchedulerLib"
+  - "../../library/includes"
   - "../../../../Core/Foundation/library/includes"
 
 libraries:
   - FOUNDATION
+  - MODULAR
   - win winmm.lib
diff --git a/Modular/extensions/WebSocket/WebSocket.xcodeproj/project.pbxproj b/Modular/extensions/WebSocket/WebSocket.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
 		B5CCAFB7188400AC00193AA8 /* WebSocketAnswer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CD3B5818117BB0008CB133 /* WebSocketAnswer.cpp */; };
 		B5CCAFB8188400AC00193AA8 /* WebSocketAnswerManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CD3B5918117BB0008CB133 /* WebSocketAnswerManager.cpp */; };
 		B5CCAFB9188400AC00193AA8 /* WebSocketSenderManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5CD3B5A18117BB0008CB133 /* WebSocketSenderManager.cpp */; };
-		B5CCAFBA188400B100193AA8 /* Protocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D26DFB7714B208E000417FFE /* Protocol.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,8 +26,6 @@
 		B5F3D2591811914E00B91813 /* WebSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocket.h; sourceTree = "<group>"; };
 		B5F3D25A1811914E00B91813 /* WebSocketInclude.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketInclude.h; sourceTree = "<group>"; };
 		B5F3D25B1811915900B91813 /* WebSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSocket.cpp; sourceTree = "<group>"; };
-		D26DFB7714B208E000417FFE /* Protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Protocol.cpp; sourceTree = "<group>"; };
-		D26DFB7814B208E000417FFE /* Protocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Protocol.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -46,7 +43,6 @@
 			isa = PBXGroup;
 			children = (
 				22AD15D716596523002FD7E3 /* WebSocket.yml */,
-				D26DFB7614B208E000417FFE /* ProtocolLib */,
 				D2AF80B214A0BA940001E901 /* includes */,
 				D2AF80B814A0BAA00001E901 /* source */,
 				B5CCAFAE1884002800193AA8 /* WebSocketPlugin-doc */,
@@ -70,16 +66,6 @@
 			path = "WebSocketPlugin-doc";
 			sourceTree = "<group>";
 		};
-		D26DFB7614B208E000417FFE /* ProtocolLib */ = {
-			isa = PBXGroup;
-			children = (
-				D26DFB7814B208E000417FFE /* Protocol.h */,
-				D26DFB7714B208E000417FFE /* Protocol.cpp */,
-			);
-			name = ProtocolLib;
-			path = ../../library/ProtocolLib;
-			sourceTree = SOURCE_ROOT;
-		};
 		D2AF80B214A0BA940001E901 /* includes */ = {
 			isa = PBXGroup;
 			children = (
@@ -173,7 +159,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B5CCAFBA188400B100193AA8 /* Protocol.cpp in Sources */,
 				B5CCAFB9188400AC00193AA8 /* WebSocketSenderManager.cpp in Sources */,
 				B5CCAFB8188400AC00193AA8 /* WebSocketAnswerManager.cpp in Sources */,
 				B5CCAFB7188400AC00193AA8 /* WebSocketAnswer.cpp in Sources */,

diff --git a/Modular/extensions/WebSocket/WebSocket.yml b/Modular/extensions/WebSocket/WebSocket.yml
@@ -1,8 +1,8 @@
 defines:
+  - TT_NO_DSP	
   - TT_PROTOCOL_DEBUG
 
 sources:
-  - ../../library/ProtocolLib/Protocol.cpp
   - source/WebSocket.cpp
   - source/WebSocketAnswer.cpp
   - source/WebSocketAnswerManager.cpp
@@ -25,9 +25,10 @@ sources:
 includes:
   - "."
   - "includes"
-  - "../../library/ProtocolLib"
+  - "../../library/includes"
   - "../../../../Core/Foundation/library/includes"
   - "libjson"
 
 libraries:
   - FOUNDATION
+  - MODULAR
diff --git a/Modular/library/includes/Protocol.h b/Modular/library/includes/Protocol.h
@@ -17,7 +17,7 @@
 #ifndef __PROTOCOL_H__
 #define __PROTOCOL_H__
 
-#include "TTFoundationAPI.h"
+#include "TTModularIncludes.h"
 
 /** Declares instantiation and registration methods to add the protocol class as any #TTObject class */
 #define PROTOCOL_CONSTRUCTOR \
@@ -57,7 +57,7 @@ TTString _attrname_##name(#name); _attrname_##name.at(0)=tolower(_attrname_##nam
 /**	Protocol is the base class for all protocol protocol.
  It still has knowledge and support for ...
  */
-class Protocol : public TTObjectBase {
+class TTMODULAR_EXPORT Protocol : public TTObjectBase {
 
 protected:																																	
 	TTObject                    mApplicationManager;				///< the application manager of the Modular framework.					

diff --git a/Modular/library/includes/Scheduler.h b/Modular/library/includes/Scheduler.h
@@ -17,7 +17,8 @@
 #ifndef __SCHEDULER_H__
 #define __SCHEDULER_H__
 
-#include "TTFoundationAPI.h"
+#include "TTModularIncludes.h"
+//#include "TTFoundationAPI.h"
 #include <atomic>
 
 #define SCHEDULER_CONSTRUCTOR \
@@ -43,7 +44,7 @@ typedef void (*SchedulerPositionCallback)(TTPtr, TTFloat64, TTFloat64);
 /**	Scheduler is the base class for all Scheduler Unit.
  It still has knowledge and support for ...
  */
-class Scheduler : public TTObjectBase {
+class TTMODULAR_EXPORT Scheduler : public TTObjectBase {
 
 public: