From ada9b67a75c45da79a3640b88824ba0fe55527c7 Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Sat, 26 Jan 2019 19:05:04 +0100
Subject: [PATCH] LaunchAPPLServer: enable OpenTransport on 68K

---
 LaunchAPPL/Server/CMakeLists.txt              | 33 ++++++++-----------
 LaunchAPPL/Server/LaunchAPPLServer.cc         |  6 ----
 LaunchAPPL/Server/LaunchAPPLServer.segmap     |  4 +++
 .../Server/OpenTptConnectionProvider.cc       |  2 +-
 4 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/LaunchAPPL/Server/CMakeLists.txt b/LaunchAPPL/Server/CMakeLists.txt
index 0f9e07f93f..9c79334ef5 100644
--- a/LaunchAPPL/Server/CMakeLists.txt
+++ b/LaunchAPPL/Server/CMakeLists.txt
@@ -1,4 +1,14 @@
-set(CONNECTION_SOURCES)
+set(CONNECTION_SOURCES
+        OpenTptStream.h
+        OpenTptStream.cc
+        OpenTptConnectionProvider.h
+        OpenTptConnectionProvider.cc
+
+        SharedFileStream.h
+        SharedFileStream.cc
+        SharedFileProvider.h
+        SharedFileProvider.cc
+    )
 
 if(CMAKE_SYSTEM_NAME MATCHES RetroCarbon)
 else()
@@ -13,24 +23,7 @@ else()
             TCPConnectionProvider.h
             TCPConnectionProvider.cc
         )
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES Retro68)
-else()
-    list(APPEND CONNECTION_SOURCES
-            OpenTptStream.h
-            OpenTptStream.cc
-            OpenTptConnectionProvider.h
-            OpenTptConnectionProvider.cc
-        )
-endif()
-
-list(APPEND CONNECTION_SOURCES
-    SharedFileStream.h
-    SharedFileStream.cc
-    SharedFileProvider.h
-    SharedFileProvider.cc
-)
+endif()        
 
 option(LAUNCHAPPLSERVER_DEBUG_CONSOLE "Add a debug console to LaunchAPPLServer" FALSE)
 
@@ -85,7 +78,7 @@ if(CMAKE_SYSTEM_NAME MATCHES RetroPPC)
     target_link_libraries(LaunchAPPLServer -lOpenTransportAppPPC -lOpenTransportLib -lOpenTptInternetLib -lNavigationLib)
 endif()
 if(CMAKE_SYSTEM_NAME MATCHES Retro68)
-    target_link_libraries(LaunchAPPLServer -lNavigation.far)
+    target_link_libraries(LaunchAPPLServer -lOpenTransport -lOpenTransportApp -lOpenTptInet -lNavigation.far)
 endif()
 
 if(FALSE)
diff --git a/LaunchAPPL/Server/LaunchAPPLServer.cc b/LaunchAPPL/Server/LaunchAPPLServer.cc
index dd1d3c901f..fd3509ff29 100644
--- a/LaunchAPPL/Server/LaunchAPPLServer.cc
+++ b/LaunchAPPL/Server/LaunchAPPLServer.cc
@@ -46,9 +46,7 @@
 #include "SerialConnectionProvider.h"
 #include "TCPConnectionProvider.h"
 #endif
-#if !TARGET_CPU_68K
 #include "OpenTptConnectionProvider.h"
-#endif
 #include "SharedFileProvider.h"
 
 #include "SystemInfo.h"
@@ -579,11 +577,9 @@ void ConnectionChanged()
             connection = std::make_unique<SerialConnectionProvider>(0, gPrefs.baud, statusDisplay.get());
             break;
 #endif
-#if !TARGET_CPU_68K
         case Port::openTptTCP:
             connection = std::make_unique<OpenTptConnectionProvider>(statusDisplay.get());;
             break;
-#endif
         case Port::sharedFiles:
             if(gPrefs.sharedDirectoryPath[0] == 0)
             {
@@ -699,14 +695,12 @@ int main()
         }
     }
 #endif
-#if !TARGET_CPU_68K
     if(hasGestalt)
     {
         long resp;
         if(Gestalt(gestaltOpenTpt, &resp) == noErr && resp)
             portsAvailable[(int)Port::openTptTCP] = true;
     }
-#endif
 
     SetMenuBar(GetNewMBar(128));
     AppendResMenu(GetMenu(128), 'DRVR');
diff --git a/LaunchAPPL/Server/LaunchAPPLServer.segmap b/LaunchAPPL/Server/LaunchAPPLServer.segmap
index edc8ddec4b..5c5def6e99 100644
--- a/LaunchAPPL/Server/LaunchAPPLServer.segmap
+++ b/LaunchAPPL/Server/LaunchAPPLServer.segmap
@@ -7,6 +7,10 @@ SEGMENT MacTCP
     */MacTCPStream.*
     */TCPConnectionProvider.*
 
+SEGMENT OpenTransport
+    */OpenTpt*.*
+    */libOpenT*.a:*
+
 SEGMENT SharedFile
     */SharedFile*.*
 
diff --git a/LaunchAPPL/Server/OpenTptConnectionProvider.cc b/LaunchAPPL/Server/OpenTptConnectionProvider.cc
index e9135566b3..d185d7a6d7 100644
--- a/LaunchAPPL/Server/OpenTptConnectionProvider.cc
+++ b/LaunchAPPL/Server/OpenTptConnectionProvider.cc
@@ -54,5 +54,5 @@ void OpenTptConnectionProvider::unloadSegDummy()
 
 void *OpenTptConnectionProvider::segmentToUnload()
 {
-    return nullptr;//(void*) &unloadSegDummy;
+    return (void*) &unloadSegDummy;
 }