Get libretro core compiling for Windows

.github/README.md

@@ -132,6 +132,15 @@ You can use `sudo apt-get -y install $(cat AppleWin/source/linux/raspbian.list.t
 
 See [Travis](/.travis.yml) CI too.
 
+### Windows (libretro core only)
+
+Build using msys2, using the standard build instructions below.
+
+Install the following packages (for x64 build):
+```
+pacman -S mingw-w64-x86_64-cmake mingw-w64-x86_64-libyaml mingw-w64-x86_64-minizip mingw-w64-x86_64-libslirp
+```
+
 ### Building
 
 ```

.gitignore

@@ -249,3 +249,6 @@ CMakeLists.txt.user*
 
 # VSCode
 .vscode
+
+# libretro
+source/frontends/libretro/*.inl

CMakeLists.txt

@@ -26,6 +26,10 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   add_compile_options(-Werror=format -Wno-error=format-overflow -Wno-error=format-truncation -Wno-psabi)
 endif()
 
+if (BUILD_LIBRETRO)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
+endif()
+
 MESSAGE("CMAKE_BUILD_TYPE:                ${CMAKE_BUILD_TYPE}")
 MESSAGE("CMAKE_CXX_FLAGS:                 ${CMAKE_CXX_FLAGS}")
 MESSAGE("CMAKE_CXX_FLAGS_RELEASE:         ${CMAKE_CXX_FLAGS_RELEASE}")
@@ -54,7 +58,9 @@ endif()
 include_directories(source)
 
 add_subdirectory(source)
-add_subdirectory(source/linux/libwindows)
+if (NOT WIN32)
+  add_subdirectory(source/linux/libwindows)
+endif()
 add_subdirectory(test/TestCPU6502)
 
 if (BUILD_LIBRETRO OR BUILD_APPLEN OR BUILD_SA2)

source/CMakeLists.txt

@@ -37,8 +37,6 @@ if ("${SLIRP_FOUND}" STREQUAL "")
   endif()
 endif()
 
-find_package(Boost REQUIRED)
-
 set(SOURCE_FILES
   Tfe/tfesupp.cpp
   Tfe/NetworkBackend.cpp
@@ -103,19 +101,13 @@ set(SOURCE_FILES
   FrameBase.cpp
   CmdLine.cpp
 
-  Configuration/PropertySheetHelper.cpp
-  Configuration/Config.cpp
-
-  linux/resources.cpp
-  linux/benchmark.cpp
+  linux/context.cpp
+  linux/linuxframe.cpp
   linux/paddle.cpp
-  linux/version.cpp
   linux/registryclass.cpp
-  linux/linuxframe.cpp
-  linux/context.cpp
-  linux/cassettetape.cpp
-  linux/network/slirp2.cpp
-  linux/network/portfwds.cpp
+  linux/resources.cpp
+  linux/soundbuffer.cpp
+  linux/version.cpp
 
   linux/duplicates/Debugger_Display.cpp
   linux/duplicates/Debugger_Win32.cpp
@@ -132,12 +124,15 @@ set(SOURCE_FILES
   linux/duplicates/PageSound.cpp
   linux/duplicates/PageDisk.cpp
   linux/duplicates/PageAdvanced.cpp
+
+  Configuration/PropertySheetHelper.cpp
+  Configuration/Config.cpp
 
   Z80VICE/z80.cpp
   Z80VICE/z80mem.cpp
   Z80VICE/daa.cpp
   )
-
+	
 set(HEADER_FILES
   Tfe/tfearch.h
   Tfe/tfesupp.h
@@ -218,28 +213,63 @@ set(HEADER_FILES
   Configuration/PropertySheetHelper.h
   Configuration/Config.h
 
-  linux/resources.h
-  linux/linuxinterface.h
-  linux/benchmark.h
-  linux/paddle.h
-  linux/version.h
-  linux/registryclass.h
-  linux/keyboardbuffer.h
-  linux/linuxframe.h
-  linux/cassettetape.h
-  linux/network/slirp2.h
-  linux/network/portfwds.h
-
   Z80VICE/z80.h
   Z80VICE/z80mem.h
   Z80VICE/z80regs.h
   Z80VICE/daa.h
   )
 
+if(WIN32)
+  set(SOURCE_FILES_PLATFORM
+    Registry.cpp
+    Keyboard.cpp
+    Speech.cpp
+    Tape.cpp
+    )
+  set(HEADER_FILES_PLATFORM
+    Registry.h
+    Keyboard.h
+    )
+  set(EXTRA_LIBS -lwsock32 -liphlpapi -ldsound -ldxguid -lwinmm -ldinput8 -luser32 -lgdi32 -lcomctl32 -lsapi -lstrmiids)
+
+  # force static link of dependent libraries
+  if(EXISTS "${YAML_LIBRARY_DIRS}/libyaml.a")
+    set(YAML_LIBRARIES -L${YAML_LIBRARY_DIRS};libyaml.a)
+  endif()
+  if(EXISTS "${MINIZIP_LIBRARY_DIRS}/libminizip.a")
+    set(MINIZIP_LIBRARIES -L${MINIZIP_LIBRARY_DIRS};libminizip.a;libz.a;libbz2.a)
+  endif()
+  if(EXISTS "${SLIRP_LIBDIR}/libslirp.a")
+    set(SLIRP_LIBRARIES -L${SLIRP_LIBDIR};libslirp.a;libintl.a)
+  endif()
+else()
+  set(SOURCE_FILES_PLATFORM
+    linux/benchmark.cpp
+    linux/cassettetape.cpp
+    linux/network/slirp2.cpp
+    linux/network/portfwds.cpp
+    )
+
+  set(HEADER_FILES_PLATFORM
+    linux/resources.h
+    linux/benchmark.h
+    linux/paddle.h
+    linux/version.h
+    linux/registryclass.h
+    linux/keyboardbuffer.h
+    linux/linuxframe.h
+    linux/cassettetape.h
+    linux/network/slirp2.h
+    linux/network/portfwds.h
+    )
+
+  set(EXTRA_LIBS windows)
+endif()
+
 # we used to generate a shared object, but it turns out there are more cons than pros
 add_library(appleii STATIC
-  ${SOURCE_FILES}
-  ${HEADER_FILES}
+  ${SOURCE_FILES} ${SOURCE_FILES_PLATFORM}
+  ${HEADER_FILES} ${HEADER_FILES_PLATFORM}
   )
 
 if ("${PCAP_FOUND}" STREQUAL "1")
@@ -251,7 +281,6 @@ endif()
 target_include_directories(appleii PRIVATE
   ${YAML_INCLUDE_DIRS}
   ${PCAP_INCLUDE_DIRS}
-  ${Boost_INCLUDE_DIRS}
   ${SLIRP_INCLUDE_DIRS}
   Debugger
   )
@@ -268,10 +297,8 @@ target_link_libraries(appleii PRIVATE
   ${PCAP_LIBRARIES}
   ${SLIRP_LIBRARIES}
   ZLIB::ZLIB
-  )
-
-target_link_libraries(appleii PUBLIC
-  windows
+  common2
+  ${EXTRA_LIBS}
   )
 
 target_link_directories(appleii PRIVATE
@@ -287,7 +314,8 @@ target_compile_options(appleii PUBLIC
 
 add_custom_command(
   TARGET appleii POST_BUILD
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/bin/*.SYM ${CMAKE_BINARY_DIR}
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/bin/A2_BASIC.SYM ${CMAKE_BINARY_DIR}
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/bin/APPLE2E.SYM ${CMAKE_BINARY_DIR}
   )
 
 configure_file(linux/config.h.in linux/config.h)

source/Common.h

@@ -140,7 +140,7 @@ enum AppMode_e
 #define WM_USER_FULLSCREEN	WM_USER+8
 #define VK_SNAPSHOT_TEXT	WM_USER+9 // PrintScreen+Ctrl
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #define PATH_SEPARATOR '\\'
 #else
 #define PATH_SEPARATOR '/'

source/Debugger/Debug.cpp

@@ -6538,7 +6538,9 @@ bool ParseAssemblyListing ( bool bBytesToMemory, bool bAddSymbols )
 		{
 			*p = 0;
 			//	sscanf( sLine, "%s %s %s %s %s %s %s %s", sAddr1, sByte1, sByte2, sByte3, sLineN, sLabel, sAsm, sParam );
-			sscanf( sLine, "%X", &nAddress );
+			unsigned nScanAddress; // helper variable in case sizeof(DWORD) != sizeof(unsigned)
+			sscanf( sLine, "%X", &nScanAddress );
+			nAddress = nScanAddress;
 
 			if (nAddress >= INVALID_ADDRESS) // || (sName[0] == 0) )
 				continue;

source/Debugger/Debugger_Console.cpp

@@ -31,6 +31,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Debug.h"
 #include "StrFormat.h"
 
+#ifndef CONSOLE_INPUT_CHAR16
+#include <cstring>
+#endif
+
 // Console ________________________________________________________________________________________
 
 	// See ConsoleInputReset() for why the console input

source/Debugger/Debugger_Symbols.cpp

@@ -659,7 +659,7 @@ int ParseSymbolTable(const std::string & pPathFileName, SymbolTable_Index_e eSym
 					, CHC_INFO
 					, CHC_ARG_SEP
 					, CHC_ADDRESS
-					, nAddress
+					, (unsigned)nAddress
 					, CHC_SYMBOL
 					, pSymbolPrev->c_str()
 					, CHC_DEFAULT
@@ -714,7 +714,7 @@ int ParseSymbolTable(const std::string & pPathFileName, SymbolTable_Index_e eSym
 				ConsolePrintFormat( "  %s$%s%04X %s%-31s%s"
 					, CHC_ARG_SEP
 					, CHC_ADDRESS
-					, nAddress
+					, (unsigned)nAddress
 					, CHC_SYMBOL
 					, sName
 					, CHC_DEFAULT

source/DiskImage.h

@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "DiskDefs.h"
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 #define RAND_THRESHOLD(num, den) ((RAND_MAX * num) / den)
 

source/Log.cpp

@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 FILE* g_fh = NULL;
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #define LOG_FILENAME "AppleWin.log"
 #else
 // save to /tmp as otherwise it creates a file in the current folder which can be a bit everywhere
@@ -49,7 +49,7 @@ inline std::string GetTimeStamp()
 {
 	time_t ltime;
 	time(&ltime);
-#ifdef _MSC_VER
+#ifdef _WIN32
 	char ct[32];
 	ctime_s(ct, sizeof(ct), &ltime);
 #else

source/Memory.cpp

@@ -60,7 +60,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 // This is not available in Windows CRT:
 // https://en.cppreference.com/w/c/memory/aligned_alloc
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 // VirtualAlloc is aligned
 #define ALIGNED_ALLOC(size) (LPBYTE)VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE)
 #define ALIGNED_FREE(ptr) VirtualFree(ptr, 0, MEM_RELEASE)
@@ -244,7 +244,7 @@ static const UINT kNumAnnunciators = 4;
 static bool g_Annunciator[kNumAnnunciators] = {};
 
 static const UINT num64KPages = 2;  // number of 64K pages used to create hardware circular buffer
-#ifdef _MSC_VER
+#ifdef _WIN32
 static HANDLE g_hMemImage = NULL;	// NB. When not initialised, this handle is NULL (not INVALID_HANDLE_VALUE)
 #else
 static FILE * g_hMemTempFile = NULL;
@@ -1528,7 +1528,7 @@ bool MemIsAddrCodeMemory(const USHORT addr)
 
 static void FreeMemImage(void)
 {
-#ifdef _MSC_VER
+#ifdef _WIN32
 	if (g_hMemImage)
 	{
 		for (UINT i = 0; i < num64KPages; i++)
@@ -1559,7 +1559,7 @@ static void FreeMemImage(void)
 
 static LPBYTE AllocMemImage(void)
 {
-#ifdef _MSC_VER
+#ifdef _WIN32
 	LPBYTE baseAddr = NULL;
 
 	// Allocate memory for 'memimage' (and the alias 'mem')

source/MockingboardCardManager.cpp

@@ -284,10 +284,10 @@ bool MockingboardCardManager::Init(void)
 		return false;
 
 	HRESULT hr = DSGetSoundBuffer(&m_mockingboardVoice, DSBCAPS_CTRLVOLUME, SOUNDBUFFER_SIZE, MockingboardCard::SAMPLE_RATE, MockingboardCard::NUM_MB_CHANNELS, "MB");
-	LogFileOutput("MBCardMgr: DSGetSoundBuffer(), hr=0x%08X\n", hr);
+	LogFileOutput("MBCardMgr: DSGetSoundBuffer(), hr=0x%08X\n", (unsigned)hr);
 	if (FAILED(hr))
 	{
-		LogFileOutput("MBCardMgr: DSGetSoundBuffer failed (%08X)\n", hr);
+		LogFileOutput("MBCardMgr: DSGetSoundBuffer failed (%08X)\n", (unsigned)hr);
 		return false;
 	}
 
@@ -303,7 +303,7 @@ bool MockingboardCardManager::Init(void)
 		m_mockingboardVoice.nVolume = DSBVOLUME_MAX;
 
 	hr = m_mockingboardVoice.lpDSBvoice->SetVolume(m_mockingboardVoice.nVolume);
-	LogFileOutput("MBCardMgr: SetVolume(), hr=0x%08X\n", hr);
+	LogFileOutput("MBCardMgr: SetVolume(), hr=0x%08X\n", (unsigned)hr);
 	return true;
 }
 

source/SerialComms.h

@@ -2,6 +2,10 @@
 
 #include "Card.h"
 
+#ifdef _WIN32
+#include <winsock.h>
+#endif
+
 enum {COMMEVT_WAIT=0, COMMEVT_ACK, COMMEVT_TERM, COMMEVT_MAX};
 enum eFWMODE {FWMODE_CIC=0, FWMODE_SIC_P8, FWMODE_PPC, FWMODE_SIC_P8A};	// NB. CIC = SSC
 

source/SoundBufferBase.h

@@ -0,0 +1,26 @@
+#pragma once
+
+class SoundBufferBase
+{
+public:
+	typedef SoundBufferBase* (*CreateSoundBufferFunc)(void);
+	static CreateSoundBufferFunc Create;
+
+	virtual HRESULT Init(DWORD dwFlags, DWORD dwBufferSize, DWORD nSampleRate, int nChannels, LPCSTR pDevName) = 0;
+	virtual HRESULT Release() = 0;
+
+	virtual HRESULT SetCurrentPosition(DWORD dwNewPosition) = 0;
+	virtual HRESULT GetCurrentPosition(LPDWORD lpdwCurrentPlayCursor, LPDWORD lpdwCurrentWriteCursor) = 0;
+
+	virtual HRESULT Lock(DWORD dwWriteCursor, DWORD dwWriteBytes, LPVOID* lplpvAudioPtr1, DWORD* lpdwAudioBytes1, LPVOID* lplpvAudioPtr2, DWORD* lpdwAudioBytes2, DWORD dwFlags) = 0;
+	virtual HRESULT Unlock(LPVOID lpvAudioPtr1, DWORD dwAudioBytes1, LPVOID lpvAudioPtr2, DWORD dwAudioBytes2) = 0;
+
+	virtual HRESULT Stop() = 0;
+	virtual HRESULT Play(DWORD dwReserved1, DWORD dwReserved2, DWORD dwFlags) = 0;
+
+	virtual HRESULT SetVolume(LONG lVolume) = 0;
+	virtual HRESULT GetVolume(LONG* lplVolume) = 0;
+
+	virtual HRESULT GetStatus(LPDWORD lpdwStatus) = 0;
+	virtual HRESULT Restore() = 0;
+};