LaunchAPPLServer: use navservices on 68K

LaunchAPPL/Server/CMakeLists.txt

@@ -84,6 +84,9 @@ endif()
 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)
+endif()
 
 if(FALSE)
 add_application(tcptest 

LaunchAPPL/Server/LaunchAPPLServer.segmap

@@ -14,5 +14,9 @@ SEGMENT Launcher
     */AppLauncher.*
     */ToolLauncher.*
 
+SEGMENT Preferences
+    */Preferences.*
+    */libNavigation.far.a:*
+
 SEGMENT libstdc++
     */libstdc++.a:*

LaunchAPPL/Server/Preferences.cc

@@ -70,9 +70,6 @@ static void ConvertToPathName(const FSSpec& spec)
     WritePrefs();
 }
 
-#if !TARGET_CPU_68K
-    // TODO: need to properly link to Navigation.far.o on 68K
-
 static pascal void NavEventProc(NavEventCallbackMessage callBackSelector, NavCBRecPtr callBackParms, void *callBackUD)
 {
     if(callBackSelector == kNavCBEvent)
@@ -125,7 +122,6 @@ static bool ChooseSharedDirectoryNav(FSSpec& spec)
     }
     return success;
 }
-#endif
 
 #if !TARGET_API_MAC_CARBON
 static bool choosePressed = false;
@@ -223,19 +219,18 @@ void ChooseSharedDirectory()
     bool ok = false;
 
 
-#if TARGET_API_MAC_CARBON
+#if TARGET_CPU_68K
-    ok = ChooseSharedDirectoryNav(spec); 
-#else
-
-#if !TARGET_CPU_68K
-    if(NavServicesAvailable())
-        ok = ChooseSharedDirectoryNav(spec);
-#else
     if(!hasSys7StdFile)
         ok = ChooseSharedDirectory6(spec);
-#endif
     else
-        ok = ChooseSharedDirectory7(spec);
+#endif
+#if !TARGET_API_MAC_CARBON
+        if(NavServicesAvailable())
+#endif
+            ok = ChooseSharedDirectoryNav(spec);
+#if !TARGET_API_MAC_CARBON
+        else
+            ok = ChooseSharedDirectory7(spec);
 #endif
 
     if(ok)