diff options
| author | Wohlstand <admin@wohlnet.ru> | 2024-08-29 18:58:33 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2024-08-29 18:58:33 +0300 |
| commit | 16734cece4f6bef3fbb82efc6d970a96dc26958c (patch) | |
| tree | db2b8c93f81476964b49260203b2728fccccf5a8 /utils | |
| parent | c0ed6b879ac921ee822d39bc2ea550c731b73e4c (diff) | |
| parent | 70cbcd2fb13d651da76030ae43c05920478652d5 (diff) | |
| download | libADLMIDI-16734cece4f6bef3fbb82efc6d970a96dc26958c.tar.gz libADLMIDI-16734cece4f6bef3fbb82efc6d970a96dc26958c.tar.bz2 libADLMIDI-16734cece4f6bef3fbb82efc6d970a96dc26958c.zip | |
Merge branch 'master' into wip-hw-serial
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/winmm_drv/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | utils/winmm_drv/cpl/adlconfig.def | 2 |
2 files changed, 20 insertions, 4 deletions
diff --git a/utils/winmm_drv/CMakeLists.txt b/utils/winmm_drv/CMakeLists.txt index 79bf099..f5e55d0 100644 --- a/utils/winmm_drv/CMakeLists.txt +++ b/utils/winmm_drv/CMakeLists.txt @@ -16,7 +16,11 @@ set(ADLMIDI_DRIVER_SRC src/winmm_drv.def src/winmm_drv.cpp src/MidiSynth.cpp + src/MidiSynth.h + src/stdafx.h + src/targetver.h config/regconfig.c + config/regconfig.h ) add_library(adlmididrv MODULE ${ADLMIDI_DRIVER_SRC}) @@ -85,7 +89,9 @@ configure_file(installer/uninstall.bat ${CMAKE_BINARY_DIR}/uninstall.bat COPYONL add_executable(drvtest test/test.c) target_link_libraries(drvtest PRIVATE winmm) -target_compile_options(drvtest PRIVATE "-Wno-cast-function-type") +if(NOT MSVC) + target_compile_options(drvtest PRIVATE "-Wno-cast-function-type") +endif() if(WITH_WINMMDRV_MINGWEX) set_property(TARGET drvtest APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-Bstatic,--whole-archive -lmingwex -Wl,-Bdynamic,--no-whole-archive") endif() @@ -99,10 +105,17 @@ set(ADLMIDI_DRIVER_SRC cpl/adlconfig.def cpl/adlconfig.rc cpl/config_dialog.c + cpl/config_dialog.h + cpl/resource.h + cpl/targetver.h config/regconfig.c + config/regconfig.h ) -add_library(adlmidiconfig MODULE ${ADLMIDI_DRIVER_SRC} cpl/adlconfig.c cpl/res-cpl.rc) +add_library(adlmidiconfig MODULE ${ADLMIDI_DRIVER_SRC} cpl/adlconfig.c) +if(NOT MSVC) + target_sources(adlmidiconfig PRIVATE cpl/res-cpl.rc) +endif() set_target_properties(adlmidiconfig PROPERTIES PREFIX "" OUTPUT_NAME "libadlconfig" SUFFIX ".cpl") target_include_directories(adlmidiconfig PRIVATE config) target_compile_definitions(adlmidiconfig PRIVATE @@ -117,7 +130,10 @@ target_compile_definitions(adlmidiconfig PRIVATE target_link_libraries(adlmidiconfig PRIVATE winmm comctl32 gdi32 user32) -add_executable(adlmidiconfigtool ${ADLMIDI_DRIVER_SRC} cpl/adlconfig-tool.c cpl/res-tool.rc) +add_executable(adlmidiconfigtool ${ADLMIDI_DRIVER_SRC} cpl/adlconfig-tool.c) +if(NOT MSVC) + target_sources(adlmidiconfigtool PRIVATE cpl/res-tool.rc) +endif() set_target_properties(adlmidiconfigtool PROPERTIES WIN32_EXECUTABLE ON) target_include_directories(adlmidiconfigtool PRIVATE config) target_compile_definitions(adlmidiconfigtool PRIVATE diff --git a/utils/winmm_drv/cpl/adlconfig.def b/utils/winmm_drv/cpl/adlconfig.def index 97ed971..52fe283 100644 --- a/utils/winmm_drv/cpl/adlconfig.def +++ b/utils/winmm_drv/cpl/adlconfig.def @@ -1,4 +1,4 @@ -LIBRARY "libADLMIDIConfig" +LIBRARY "libadlconfig.cpl" EXPORTS CPlApplet |