From 50169cb188a2f283c10fffd6661db0eb3cee6644 Mon Sep 17 00:00:00 2001 From: toxie Date: Sat, 25 Nov 2023 17:43:22 +0100 Subject: [PATCH] hopefully fix libpinmame build part III --- cmake/libpinmame/CMakeLists_android-arm64-v8a.txt | 2 ++ cmake/libpinmame/CMakeLists_ios-arm64.txt | 2 ++ cmake/libpinmame/CMakeLists_linux-x64.txt | 2 ++ cmake/libpinmame/CMakeLists_osx-arm64.txt | 2 ++ cmake/libpinmame/CMakeLists_osx-x64.txt | 2 ++ cmake/libpinmame/CMakeLists_tvos-arm64.txt | 2 ++ cmake/libpinmame/CMakeLists_win-arm64.txt | 2 ++ cmake/libpinmame/CMakeLists_win-x64.txt | 2 ++ cmake/libpinmame/CMakeLists_win-x86.txt | 2 ++ src/wpc/dmddevice.cpp | 5 ++++- 10 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cmake/libpinmame/CMakeLists_android-arm64-v8a.txt b/cmake/libpinmame/CMakeLists_android-arm64-v8a.txt index 1de71a2cc..3527d4ea5 100644 --- a/cmake/libpinmame/CMakeLists_android-arm64-v8a.txt +++ b/cmake/libpinmame/CMakeLists_android-arm64-v8a.txt @@ -388,6 +388,8 @@ add_library(pinmame SHARED src/wpc/degames.c src/wpc/desound.c src/wpc/desound.h + src/wpc/dmddevice.h + src/wpc/dmddevice.cpp src/wpc/driver.c src/wpc/efo.c src/wpc/efosnd.c diff --git a/cmake/libpinmame/CMakeLists_ios-arm64.txt b/cmake/libpinmame/CMakeLists_ios-arm64.txt index dc84b2842..bef2e391b 100644 --- a/cmake/libpinmame/CMakeLists_ios-arm64.txt +++ b/cmake/libpinmame/CMakeLists_ios-arm64.txt @@ -399,6 +399,8 @@ add_library(pinmame STATIC src/wpc/degames.c src/wpc/desound.c src/wpc/desound.h + src/wpc/dmddevice.h + src/wpc/dmddevice.cpp src/wpc/driver.c src/wpc/efo.c src/wpc/efosnd.c diff --git a/cmake/libpinmame/CMakeLists_linux-x64.txt b/cmake/libpinmame/CMakeLists_linux-x64.txt index 82be0230f..bc2638380 100644 --- a/cmake/libpinmame/CMakeLists_linux-x64.txt +++ b/cmake/libpinmame/CMakeLists_linux-x64.txt @@ -383,6 +383,8 @@ add_library(pinmame SHARED src/wpc/degames.c src/wpc/desound.c src/wpc/desound.h + src/wpc/dmddevice.h + src/wpc/dmddevice.cpp src/wpc/driver.c src/wpc/efo.c src/wpc/efosnd.c diff --git a/cmake/libpinmame/CMakeLists_osx-arm64.txt b/cmake/libpinmame/CMakeLists_osx-arm64.txt index e0cfee945..463456c46 100644 --- a/cmake/libpinmame/CMakeLists_osx-arm64.txt +++ b/cmake/libpinmame/CMakeLists_osx-arm64.txt @@ -385,6 +385,8 @@ set(PINMAME_SOURCES src/wpc/degames.c src/wpc/desound.c src/wpc/desound.h + src/wpc/dmddevice.h + src/wpc/dmddevice.cpp src/wpc/driver.c src/wpc/efo.c src/wpc/efosnd.c diff --git a/cmake/libpinmame/CMakeLists_osx-x64.txt b/cmake/libpinmame/CMakeLists_osx-x64.txt index 9e7266681..3be79f804 100644 --- a/cmake/libpinmame/CMakeLists_osx-x64.txt +++ b/cmake/libpinmame/CMakeLists_osx-x64.txt @@ -385,6 +385,8 @@ set(PINMAME_SOURCES src/wpc/degames.c src/wpc/desound.c src/wpc/desound.h + src/wpc/dmddevice.h + src/wpc/dmddevice.cpp src/wpc/driver.c src/wpc/efo.c src/wpc/efosnd.c diff --git a/cmake/libpinmame/CMakeLists_tvos-arm64.txt b/cmake/libpinmame/CMakeLists_tvos-arm64.txt index 51056b88a..2b4bde6a7 100644 --- a/cmake/libpinmame/CMakeLists_tvos-arm64.txt +++ b/cmake/libpinmame/CMakeLists_tvos-arm64.txt @@ -399,6 +399,8 @@ add_library(pinmame STATIC src/wpc/degames.c src/wpc/desound.c src/wpc/desound.h + src/wpc/dmddevice.h + src/wpc/dmddevice.cpp src/wpc/driver.c src/wpc/efo.c src/wpc/efosnd.c diff --git a/cmake/libpinmame/CMakeLists_win-arm64.txt b/cmake/libpinmame/CMakeLists_win-arm64.txt index da27f7cb9..d92b7e711 100644 --- a/cmake/libpinmame/CMakeLists_win-arm64.txt +++ b/cmake/libpinmame/CMakeLists_win-arm64.txt @@ -381,6 +381,8 @@ add_library(pinmame SHARED src/wpc/degames.c src/wpc/desound.c src/wpc/desound.h + src/wpc/dmddevice.h + src/wpc/dmddevice.cpp src/wpc/driver.c src/wpc/efo.c src/wpc/efosnd.c diff --git a/cmake/libpinmame/CMakeLists_win-x64.txt b/cmake/libpinmame/CMakeLists_win-x64.txt index 19bd943c4..e4859eeee 100644 --- a/cmake/libpinmame/CMakeLists_win-x64.txt +++ b/cmake/libpinmame/CMakeLists_win-x64.txt @@ -381,6 +381,8 @@ add_library(pinmame SHARED src/wpc/degames.c src/wpc/desound.c src/wpc/desound.h + src/wpc/dmddevice.h + src/wpc/dmddevice.cpp src/wpc/driver.c src/wpc/efo.c src/wpc/efosnd.c diff --git a/cmake/libpinmame/CMakeLists_win-x86.txt b/cmake/libpinmame/CMakeLists_win-x86.txt index 98491246e..a9b7f3b3f 100644 --- a/cmake/libpinmame/CMakeLists_win-x86.txt +++ b/cmake/libpinmame/CMakeLists_win-x86.txt @@ -381,6 +381,8 @@ add_library(pinmame SHARED src/wpc/degames.c src/wpc/desound.c src/wpc/desound.h + src/wpc/dmddevice.h + src/wpc/dmddevice.cpp src/wpc/driver.c src/wpc/efo.c src/wpc/efosnd.c diff --git a/src/wpc/dmddevice.cpp b/src/wpc/dmddevice.cpp index acbfb5056..87bcc71e4 100644 --- a/src/wpc/dmddevice.cpp +++ b/src/wpc/dmddevice.cpp @@ -1,6 +1,8 @@ +#ifndef WIN32 + #include "dmddevice.h" -#ifdef WIN32 +#else #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -10,6 +12,7 @@ #include "gen.h" #include "core.h" #include "cpu/at91/at91.h" +#include "dmddevice.h" #ifndef LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR #define LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR 0x00000100