OS flags

pvzig · pvzig · commit 23376d5c5d65 · 2018-02-07T22:46:10.000-05:00
diff --git a/SKRTMAPI.xcodeproj/project.pbxproj b/SKRTMAPI.xcodeproj/project.pbxproj
@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		2604C59C202BFD83009CDBAF /* StarscreamRTM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2604C59B202BFD83009CDBAF /* StarscreamRTM.swift */; };
+		2604C59D202BFD83009CDBAF /* StarscreamRTM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2604C59B202BFD83009CDBAF /* StarscreamRTM.swift */; };
+		2604C59E202BFD83009CDBAF /* StarscreamRTM.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2604C59B202BFD83009CDBAF /* StarscreamRTM.swift */; };
 		26D1C4CD1EE4653600C95954 /* SKCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26D1C4CA1EE4653600C95954 /* SKCore.framework */; };
 		26D1C4CE1EE4653600C95954 /* SKWebAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26D1C4CB1EE4653600C95954 /* SKWebAPI.framework */; };
 		26D1C4CF1EE4653600C95954 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26D1C4CC1EE4653600C95954 /* Starscream.framework */; };
@@ -25,6 +28,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		2604C59B202BFD83009CDBAF /* StarscreamRTM.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StarscreamRTM.swift; sourceTree = "<group>"; };
 		2684F17D1E95AA6900536DCC /* SKRTMAPI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SKRTMAPI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		2684F1E41E95ABD400536DCC /* SKRTMAPI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SKRTMAPI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		2684F2081E95ABD600536DCC /* SKRTMAPI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SKRTMAPI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -150,6 +154,7 @@
 		26DC0EAF1E95BED900991BDF /* Conformers */ = {
 			isa = PBXGroup;
 			children = (
+				2604C59B202BFD83009CDBAF /* StarscreamRTM.swift */,
 				26DC0EB11E95BED900991BDF /* VaporEngineRTM.swift */,
 				D2C085F12024BF9600FEC5AB /* WebSocketFactory.swift */,
 			);
@@ -355,6 +360,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				26DC0EB61E95BED900991BDF /* VaporEngineRTM.swift in Sources */,
+				2604C59C202BFD83009CDBAF /* StarscreamRTM.swift in Sources */,
 				26DC0EB91E95BED900991BDF /* SKRTMAPI.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -364,6 +370,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				26DC0EB71E95BED900991BDF /* VaporEngineRTM.swift in Sources */,
+				2604C59D202BFD83009CDBAF /* StarscreamRTM.swift in Sources */,
 				26DC0EBA1E95BED900991BDF /* SKRTMAPI.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -373,6 +380,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				26DC0EB81E95BED900991BDF /* VaporEngineRTM.swift in Sources */,
+				2604C59E202BFD83009CDBAF /* StarscreamRTM.swift in Sources */,
 				26DC0EBB1E95BED900991BDF /* SKRTMAPI.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Sources/SKRTMAPI/Conformers/VaporEngineRTM.swift b/Sources/SKRTMAPI/Conformers/VaporEngineRTM.swift
@@ -21,6 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+#if os(Linux)
 import Dispatch
 import Foundation
 import SKCore
@@ -75,3 +76,4 @@ public class VaporEngineRTM: RTMWebSocket {
         self.webSocket = webSocket
     }
 }
+#endif
diff --git a/Sources/SKRTMAPI/Conformers/WebSocketFactory.swift b/Sources/SKRTMAPI/Conformers/WebSocketFactory.swift
@@ -1,3 +1,4 @@
+#if os(Linux)
 import WebSockets
 import HTTP
 import Sockets
@@ -63,3 +64,4 @@ public final class WebSocketFactory {
         )
     }
 }
+#endif
diff --git a/Sources/SKRTMAPI/SKRTMAPI.swift b/Sources/SKRTMAPI/SKRTMAPI.swift
@@ -62,7 +62,11 @@ public final class SKRTMAPI: RTMDelegate {
         if let rtm = rtm {
             self.rtm = rtm
         } else {
-            self.rtm = VaporEngineRTM()
+            #if os(Linux)
+                self.rtm = VaporEngineRTM()
+            #else
+                self.rtm = StarscreamRTM()
+            #endif
         }
         self.rtm.delegate = self
     }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN`
`22`	`22`	`// THE SOFTWARE.`
`23`	`23`
	`24`	`+#if os(Linux)`
`24`	`25`	`import Dispatch`
`25`	`26`	`import Foundation`
`26`	`27`	`import SKCore`
`@@ -75,3 +76,4 @@ public class VaporEngineRTM: RTMWebSocket {`
`75`	`76`	`self.webSocket = webSocket`
`76`	`77`	`}`
`77`	`78`	`}`
	`79`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#if os(Linux)`
`1`	`2`	`import WebSockets`
`2`	`3`	`import HTTP`
`3`	`4`	`import Sockets`
`@@ -63,3 +64,4 @@ public final class WebSocketFactory {`
`63`	`64`	`)`
`64`	`65`	`}`
`65`	`66`	`}`
	`67`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,11 @@ public final class SKRTMAPI: RTMDelegate {`
`62`	`62`	`if let rtm = rtm {`
`63`	`63`	`self.rtm = rtm`
`64`	`64`	`} else {`
`65`		`- self.rtm = VaporEngineRTM()`
	`65`	`+ #if os(Linux)`
	`66`	`+ self.rtm = VaporEngineRTM()`
	`67`	`+ #else`
	`68`	`+ self.rtm = StarscreamRTM()`
	`69`	`+ #endif`
`66`	`70`	`}`
`67`	`71`	`self.rtm.delegate = self`
`68`	`72`	`}`