FreeBSD: Fix to build APPLEN

audetto · Jun 16, 2024 · 5ef6082 · 5ef6082
1 parent 757cdba
commit 5ef6082
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 0 deletions.
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -250,10 +250,22 @@ target_include_directories(appleii PRIVATE
   )
 
 # this one appears in header files
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
+# FreeBSD could already have "zip.h" (from libzip) in /usr/local/include
+# which takes precedence than the one in /usr/local/include/minizip.
+# "zip.h" from libzip is not what we want here.
+# The following changes to use include path /usr/local/include for minizip
+# so that the code can include "minizip/zip.h" explicitly.
+target_include_directories(appleii PUBLIC
+  ${CMAKE_CURRENT_BINARY_DIR}  # for config.h
+  ${MINIZIP_INCLUDE_DIRS}/..
+  )
+else()
 target_include_directories(appleii PUBLIC
   ${CMAKE_CURRENT_BINARY_DIR}  # for config.h
   ${MINIZIP_INCLUDE_DIRS}
   )
+endif()
 
 target_link_libraries(appleii PRIVATE
   ${YAML_LIBRARIES}

diff --git a/source/DiskImageHelper.cpp b/source/DiskImageHelper.cpp
@@ -34,7 +34,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Common.h"
 
 #include "zlib.h"
+#ifdef __FreeBSD__
+#include "minizip/unzip.h"
+#else
 #include "unzip.h"
+#endif
 
 #include "CPU.h"
 #include "DiskImage.h"

diff --git a/source/DiskImageHelper.h b/source/DiskImageHelper.h
@@ -2,7 +2,11 @@
 
 #include "DiskDefs.h"
 #include "DiskImage.h"
+#ifdef __FreeBSD__
+#include "minizip/zip.h"
+#else
 #include "zip.h"
+#endif
 
 #define GZ_SUFFIX ".gz"
 #define GZ_SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)

diff --git a/source/Tfe/DNS.cpp b/source/Tfe/DNS.cpp
@@ -26,6 +26,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netdb.h>
+#ifdef __FreeBSD__
+#include <sys/socket.h> // AF_INET.
+#endif
 #endif
 
 uint32_t getHostByName(const std::string & name)

diff --git a/source/Uthernet2.cpp b/source/Uthernet2.cpp
@@ -76,6 +76,9 @@ typedef int socklen_t;
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#ifdef __FreeBSD__
+#include <netinet/in.h> // sockaddr_in.
+#endif
 
 #endif
 

diff --git a/source/linux/network/portfwds.cpp b/source/linux/network/portfwds.cpp
@@ -8,6 +8,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netdb.h>
+#ifdef __FreeBSD__
+#include <netinet/in.h> // sockaddr_in.
+#endif
 
 namespace
 {