2 files changed, 8 insertions, 14 deletions
diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt
index 6907b15..525ac05 100644
--- a/utils/adlmidi-2/CMakeLists.txt
+++ b/utils/adlmidi-2/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required (VERSION 3.2)
-project(adlmidi2 CXX)
-
 set(CMAKE_CXX_STANDARD 11)
 
 find_package(OpenMP)
@@ -11,7 +8,7 @@ endif()
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS)
+if(NOT WIN32 AND NOT ADLMIDI_DOS)
     set(ADLMIDI2_HAS_PUZZLE_GAME TRUE)
     set(ADLMIDI2_VIDEO_OUT_SUPPORT TRUE)
 endif()
@@ -30,7 +27,7 @@ endif()
 add_executable(adlmidi2 ${adlmidi2_src})
 target_link_libraries(adlmidi2 PRIVATE ADLMIDI)
 
-if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS)
+if(NOT WIN32 AND NOT ADLMIDI_DOS)
     find_package(SDL2 REQUIRED)
     string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
     target_include_directories(adlmidi2 PRIVATE ${SDL2_INCLUDE_DIRS})
@@ -45,14 +42,14 @@ if(ADLMIDI2_VIDEO_OUT_SUPPORT)
     target_compile_definitions(adlmidi2 PUBLIC SUPPORT_VIDEO_OUTPUT)
 endif()
 
-if(MSDOS OR DJGPP)
+if(ADLMIDI_DOS)
     target_compile_definitions(adlmidi2 PUBLIC HARDWARE_OPL3)
     message("Turn on hardware OPL3 support on ADLMIDI2 tool")
 endif()
 
 if(WIN32)
     target_link_libraries(adlmidi2 PRIVATE winmm)
-else(NOT DJGPP AND NOT MSDOS)
+elseif(NOT ADLMIDI_DOS)
     if(NOT OPENBSD_LOCALBASE)
         target_link_libraries(adlmidi2 PRIVATE dl)
     endif()
diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt
index 3dceee4..e859f98 100644
--- a/utils/midiplay/CMakeLists.txt
+++ b/utils/midiplay/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required (VERSION 3.2)
-project(adlmidiplay CXX)
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 add_executable(adlmidiplay
@@ -8,7 +5,7 @@ add_executable(adlmidiplay
     wave_writer.c
 )
 
-if(NOT MSDOS AND NOT DJGPP AND NOT MIDIPLAY_WAVE_ONLY)
+if(NOT ADLMIDI_DOS AND NOT MIDIPLAY_WAVE_ONLY)
     find_package(SDL2 REQUIRED)
     string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
     target_include_directories(adlmidiplay PRIVATE ${SDL2_INCLUDE_DIRS})
@@ -20,7 +17,7 @@ if(MIDIPLAY_WAVE_ONLY)
     message("Demo tool will only output WAVE file, no playing support.")
 endif()
 
-if(MSDOS OR DJGPP)
+if(ADLMIDI_DOS)
     target_compile_definitions(adlmidiplay PUBLIC HARDWARE_OPL3)
     message("Turn on hardware OPL3 support on demo tool")
 endif()
@@ -31,14 +28,14 @@ if(WIN32)
     if(NOT MSVC)
         target_link_libraries(adlmidiplay PRIVATE pthread)
     endif()
-elseif(NOT MSDOS AND NOT DJGPP)
+elseif(NOT ADLMIDI_DOS)
     if(NOT OPENBSD_LOCALBASE)
         target_link_libraries(adlmidiplay PRIVATE dl)
     endif()
     target_link_libraries(adlmidiplay PRIVATE pthread m stdc++)
 endif()
 
-if(MSDOS OR DJGPP)
+if(ADLMIDI_DOS)
     set_target_properties(adlmidiplay PROPERTIES OUTPUT_NAME adlmidi)
 endif()