Merge pull request AppleWin#221 from audetto/fixes

A few simple Win32 fixes.

Author: audetto

CMakeLists.txt

@@ -49,9 +49,12 @@ include_directories(source)
 
 add_subdirectory(source)
 add_subdirectory(resource)
-add_subdirectory(source/linux/libwindows)
 add_subdirectory(test/TestCPU6502)
 
+if (NOT WIN32)
+  add_subdirectory(source/linux/libwindows)
+endif()
+
 if (BUILD_LIBRETRO OR BUILD_APPLEN OR BUILD_SA2)
   add_subdirectory(source/frontends/common2)
 endif()

source/CMakeLists.txt

@@ -272,9 +272,11 @@ target_link_libraries(appleii PRIVATE
   ZLIB::ZLIB
   )
 
-target_link_libraries(appleii PUBLIC
-  windows
-  )
+if (NOT WIN32)
+  target_link_libraries(appleii PUBLIC
+    windows
+    )
+endif()
 
 target_link_directories(appleii PRIVATE
   ${YAML_LIBRARY_DIRS}

source/frontends/common2/CMakeLists.txt

@@ -44,10 +44,15 @@ target_include_directories(common2 PRIVATE
 
 target_link_libraries(common2 PRIVATE
   appleii
-  windows
   apple2roms
 )
 
+if (NOT WIN32)
+  target_link_libraries(common2 PUBLIC
+    windows
+    )
+endif()
+
 file(RELATIVE_PATH ROOT_PATH ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
 if ("${ROOT_PATH}" STREQUAL "")
   # if the 2 paths are the same

source/frontends/libretro/CMakeLists.txt

@@ -51,9 +51,14 @@ target_link_libraries(applewin_libretro PRIVATE
   $<${static_stdcpp_fs}:stdc++fs>
   appleii
   common2
-  windows
   )
 
+if (NOT WIN32)
+  target_link_libraries(applewin_libretro PUBLIC
+    windows
+    )
+endif()
+
 # just call it "applewin_libretro.so" as per libretro standard
 set_target_properties(applewin_libretro PROPERTIES PREFIX "")
 

source/frontends/libretro/game.cpp

@@ -7,6 +7,7 @@
 #include "frontends/common2/ptreeregistry.h"
 #include "frontends/common2/programoptions.h"
 
+#include "Registry.h"
 #include "Common.h"
 #include "Interface.h"
 

source/frontends/libretro/retroregistry.cpp

@@ -3,6 +3,7 @@
 #include "frontends/common2/ptreeregistry.h"
 #include "frontends/libretro/environment.h"
 
+#include "Registry.h"
 #include "Common.h"
 #include "Card.h"
 #include "Video.h"

source/frontends/qt/CMakeLists.txt

@@ -70,10 +70,15 @@ target_link_libraries(qapple PRIVATE
   Qt::Multimedia
   appleii
   QHexView
-  windows
   apple2roms
   )
 
+if (NOT WIN32)
+  target_link_libraries(qapple PUBLIC
+    windows
+    )
+endif()
+
 if(Qt5_FOUND)
   target_sources(qapple PRIVATE
     gamepadpaddle.cpp

source/frontends/sdl/CMakeLists.txt

@@ -63,9 +63,14 @@ target_link_libraries(sa2 PRIVATE
   OpenGL::GL
   appleii
   common2
-  windows
   )
 
+if (NOT WIN32)
+  target_link_libraries(sa2 PUBLIC
+    windows
+    )
+endif()
+
 target_link_directories(sa2 PRIVATE
   ${SDL2_LIBRARY_DIRS}
   ${SDL2_IMAGE_LIBRARY_DIRS}

source/linux/linuxframe.cpp

@@ -67,7 +67,6 @@ LinuxFrame::LinuxFrame(const bool autoBoot) : myAutoBoot(autoBoot)
 {
   const std::array<int, 4> version = getVersionNumbers();
   SetAppleWinVersion(version[0], version[1], version[2], version[3]);
-  g_hFrameWindow = this;
 }
 
 void LinuxFrame::Initialize(bool resetVideoState)
@@ -178,7 +177,9 @@ std::shared_ptr<NetworkBackend> LinuxFrame::CreateNetworkBackend(const std::stri
 #endif
 }
 
+#ifndef _WIN32
 int MessageBox(HWND, LPCSTR lpText, LPCSTR lpCaption, UINT uType)
 {
   return GetFrame().FrameMessageBox(lpText, lpCaption, uType);
 }
+#endif

source/linux/linuxframe.h

@@ -54,5 +54,3 @@ class LinuxFrame : public FrameBase
 
   bool myAutoBoot;  // non const to allow settings change
 };
-
-int MessageBox(HWND, LPCSTR lpText, LPCSTR lpCaption, UINT uType);