Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2024-11-24 23:32:06 +00:00
Code Issues Projects Releases Wiki Activity

LaunchAPPLServer: enable OpenTransport on 68K

Browse Source
This commit is contained in:
Wolfgang Thaller 2019-01-26 19:05:04 +01:00
parent a3c8783a88
commit ada9b67a75
4 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
LaunchAPPL/Server/CMakeLists.txt
View File

@ -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)

6
LaunchAPPL/Server/LaunchAPPLServer.cc
View File

@ -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');

4
LaunchAPPL/Server/LaunchAPPLServer.segmap
View File

@ -7,6 +7,10 @@ SEGMENT MacTCP
*/MacTCPStream.*
*/TCPConnectionProvider.*
SEGMENT OpenTransport
*/OpenTpt*.*
*/libOpenT*.a:*
SEGMENT SharedFile
*/SharedFile*.*

2
LaunchAPPL/Server/OpenTptConnectionProvider.cc
View File

@ -54,5 +54,5 @@ void OpenTptConnectionProvider::unloadSegDummy()
void *OpenTptConnectionProvider::segmentToUnload()
{
return nullptr;//(void*) &unloadSegDummy;
return (void*) &unloadSegDummy;
}