actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove WITH_MINIMAID CMake option

Browse Source 
Always build ITGmania with Minimaid

There's no harm in always having this built as it's configurable based on the LightsDriver field.

Update mmmagic.dll -> mmmagic64.dll to conform with the new dll filename

Also fix PacDrive.h header
This commit is contained in:
teejusb
2022-12-19 20:19:16 -08:00
parent afdb32dd50
commit ef144a7f9d
4 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMake/DefineOptions.cmake
+1 -4
View File
@@ -46,10 +46,7 @@ else()
OFF) OFF)
endif() endif()
if(WIN32) if(LINUX)
option(WITH_MINIMAID "Build with Minimaid Lights Support." OFF)
elseif(LINUX)
option(WITH_MINIMAID "Build with Minimaid Lights Support." OFF)
option(WITH_PROFILING "Build with Profiling Support." OFF) option(WITH_PROFILING "Build with Profiling Support." OFF)
option(WITH_GLES2 "Build with OpenGL ES 2.0 Support." ON) option(WITH_GLES2 "Build with OpenGL ES 2.0 Support." ON)
option(WITH_GTK3 "Build with GTK3 Support." ON) option(WITH_GTK3 "Build with GTK3 Support." ON)
extern/CMakeProject-mmmagic.cmake
Vendored
-2
View File
@@ -1,5 +1,4 @@
if(LINUX) if(LINUX)
if(WITH_MINIMAID)
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64") if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
list(APPEND SMDATA_LINK_LIB list(APPEND SMDATA_LINK_LIB
"${SM_EXTERN_DIR}/libmmmagic/linux-64bit/libmmmagic.a" "udev") "${SM_EXTERN_DIR}/libmmmagic/linux-64bit/libmmmagic.a" "udev")
@@ -7,5 +6,4 @@ if(LINUX)
list(APPEND SMDATA_LINK_LIB list(APPEND SMDATA_LINK_LIB
"${SM_EXTERN_DIR}/libmmmagic/linux-32bit/libmmmagic.a" "udev") "${SM_EXTERN_DIR}/libmmmagic/linux-32bit/libmmmagic.a" "udev")
endif() endif()
endif()
endif() endif()
src/CMakeData-arch.cmake
+5 -13
View File
@@ -190,19 +190,15 @@ list(APPEND SMDATA_ARCH_LIGHTS_HPP "arch/Lights/LightsDriver.h"
if(NOT APPLE) if(NOT APPLE)
if(WIN32) if(WIN32)
list(APPEND SMDATA_ARCH_LIGHTS_SRC list(APPEND SMDATA_ARCH_LIGHTS_SRC
"arch/Lights/LightsDriver_Win32Minimaid.cpp"
"arch/Lights/LightsDriver_Win32Serial.cpp" "arch/Lights/LightsDriver_Win32Serial.cpp"
"arch/Lights/LightsDriver_Win32Parallel.cpp" "arch/Lights/LightsDriver_Win32Parallel.cpp"
"arch/Lights/LightsDriver_PacDrive.cpp") "arch/Lights/LightsDriver_PacDrive.cpp")
list(APPEND SMDATA_ARCH_LIGHTS_HPP list(APPEND SMDATA_ARCH_LIGHTS_HPP
"arch/Lights/LightsDriver_Win32Minimaid.h"
"arch/Lights/LightsDriver_Win32Parallel.h" "arch/Lights/LightsDriver_Win32Parallel.h"
"arch/Lights/LightsDriver_Win32Serial.h" "arch/Lights/LightsDriver_Win32Serial.h"
"arch/Lights/LightsDriver_PacDrive.cpp") "arch/Lights/LightsDriver_PacDrive.h")
if(WITH_MINIMAID)
list(APPEND SMDATA_ARCH_LIGHTS_SRC
"arch/Lights/LightsDriver_Win32Minimaid.cpp")
list(APPEND SMDATA_ARCH_LIGHTS_HPP
"arch/Lights/LightsDriver_Win32Minimaid.h")
endif()
else() # Unix/Linux TODO: Linux HAVE_PARALLEL_PORT else() # Unix/Linux TODO: Linux HAVE_PARALLEL_PORT
if(LINUX) if(LINUX)
list(APPEND SMDATA_LINK_LIB "udev") list(APPEND SMDATA_LINK_LIB "udev")
@@ -213,6 +209,7 @@ if(NOT APPLE)
"arch/Lights/LightsDriver_Linux_PIUIOBTN_Leds.cpp" "arch/Lights/LightsDriver_Linux_PIUIOBTN_Leds.cpp"
"arch/Lights/LightsDriver_Linux_ITGIO.cpp" "arch/Lights/LightsDriver_Linux_ITGIO.cpp"
"arch/Lights/LightsDriver_Linux_stac.cpp" "arch/Lights/LightsDriver_Linux_stac.cpp"
"arch/Lights/LightsDriver_LinuxMinimaid.cpp"
"arch/Lights/LightsDriver_LinuxWeedTech.cpp") "arch/Lights/LightsDriver_LinuxWeedTech.cpp")
list(APPEND SMDATA_ARCH_LIGHTS_HPP list(APPEND SMDATA_ARCH_LIGHTS_HPP
"arch/Lights/LightsDriver_Linux_Leds.h" "arch/Lights/LightsDriver_Linux_Leds.h"
@@ -221,6 +218,7 @@ if(NOT APPLE)
"arch/Lights/LightsDriver_Linux_PIUIOBTN_Leds.h" "arch/Lights/LightsDriver_Linux_PIUIOBTN_Leds.h"
"arch/Lights/LightsDriver_Linux_ITGIO.h" "arch/Lights/LightsDriver_Linux_ITGIO.h"
"arch/Lights/LightsDriver_Linux_stac.h" "arch/Lights/LightsDriver_Linux_stac.h"
"arch/Lights/LightsDriver_LinuxMinimaid.h"
"arch/Lights/LightsDriver_LinuxWeedTech.h") "arch/Lights/LightsDriver_LinuxWeedTech.h")
if(WITH_PARALLEL_PORT) if(WITH_PARALLEL_PORT)
list(APPEND SMDATA_ARCH_LIGHTS_SRC list(APPEND SMDATA_ARCH_LIGHTS_SRC
@@ -228,12 +226,6 @@ if(NOT APPLE)
list(APPEND SMDATA_ARCH_LIGHTS_HPP list(APPEND SMDATA_ARCH_LIGHTS_HPP
"arch/Lights/LightsDriver_LinuxParallel.h") "arch/Lights/LightsDriver_LinuxParallel.h")
endif() endif()
if(WITH_MINIMAID)
list(APPEND SMDATA_ARCH_LIGHTS_SRC
"arch/Lights/LightsDriver_LinuxMinimaid.cpp")
list(APPEND SMDATA_ARCH_LIGHTS_HPP
"arch/Lights/LightsDriver_LinuxMinimaid.h")
endif()
endif() endif()
endif(WIN32) endif(WIN32)
endif(NOT APPLE) endif(NOT APPLE)
src/arch/Lights/LightsDriver_Win32Minimaid.cpp
+1 -1
View File
@@ -50,7 +50,7 @@ void setup_driver()
LightsDriver_Win32Minimaid::LightsDriver_Win32Minimaid() LightsDriver_Win32Minimaid::LightsDriver_Win32Minimaid()
{ {
_mmmagic_loaded=false; _mmmagic_loaded=false;
hMMMAGICDLL = LoadLibraryW(L"mmmagic.dll"); hMMMAGICDLL = LoadLibraryW(L"mmmagic64.dll");
if(hMMMAGICDLL == nullptr) if(hMMMAGICDLL == nullptr)
{ {
MessageBox(nullptr, "Could not LoadLibrary( mmmagic.dll ).", "ERROR", MB_OK ); MessageBox(nullptr, "Could not LoadLibrary( mmmagic.dll ).", "ERROR", MB_OK );