move porttime into src directory and make src/portmidi directory

mixxxdj · Jul 16, 2021 · 85c89cf · 85c89cf
1 parent 517897c
commit 85c89cf
Show file tree

Hide file tree

Showing 25 changed files with 21 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(PortMIDI VERSION 235.0)
 
 option(BUILD_SHARED_LIBS "Build dynamic library" ON)
 
-add_library(PortTime porttime/porttime.c)
+add_library(PortTime src/porttime/porttime.c)
 target_include_directories(PortTime PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
@@ -14,39 +14,51 @@ set_target_properties(PortTime PROPERTIES
   WINDOWS_EXPORT_ALL_SYMBOLS TRUE
 )
 
-add_library(PortMIDI src/common/portmidi.c src/common/pmutil.c)
+add_library(PortMIDI
+  src/portmidi/common/portmidi.c
+  src/portmidi/common/pmutil.c
+)
 set_target_properties(PortMIDI PROPERTIES OUTPUT_NAME portmidi)
 set_target_properties(PortMIDI PROPERTIES
   WINDOWS_EXPORT_ALL_SYMBOLS TRUE
 )
 target_include_directories(PortMIDI PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/common>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/portmidi/common>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 target_include_directories(PortMIDI PRIVATE pm_common porttime)
 
 # FreeBSD has a reimplementation of alsalib, so don't restrict the ALSA backend strictly to Linux.
 if(UNIX AND NOT APPLE)
   find_package(ALSA REQUIRED)
-  target_sources(PortTime PRIVATE porttime/ptlinux.c)
-  target_sources(PortMIDI PRIVATE src/linux/pmlinux.c src/linux/pmlinuxalsa.c src/linux/finddefault.c)
+  target_sources(PortTime PRIVATE src/porttime/ptlinux.c)
+  target_sources(PortMIDI PRIVATE
+    src/portmidi/linux/pmlinux.c
+    src/portmidi/linux/pmlinuxalsa.c
+    src/portmidi/linux/finddefault.c)
   target_link_libraries(PortMIDI PRIVATE ALSA::ALSA)
 elseif(APPLE)
   find_library(COREAUDIO_LIBRARY CoreAudio REQUIRED)
   find_library(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED)
   find_library(COREMIDI_LIBRARY CoreMidi REQUIRED)
   find_library(CORESERVICES_LIBRARY CoreServices REQUIRED)
 
-  target_sources(PortTime PRIVATE porttime/ptmacosx_mach.c)
+  target_sources(PortTime PRIVATE src/porttime/ptmacosx_mach.c)
   target_link_libraries(PortTime PRIVATE ${COREAUDIO_LIBRARY} ${COREFOUNDATION_LIBRARY})
 
-  target_sources(PortMIDI PRIVATE src/mac/pmmac.c src/mac/pmmacosxcm.c src/mac/finddefault.c src/mac/readbinaryplist.c)
+  target_sources(PortMIDI PRIVATE
+    src/portmidi/mac/pmmac.c
+    src/portmidi/mac/pmmacosxcm.c
+    src/portmidi/mac/finddefault.c
+    src/portmidi/mac/readbinaryplist.c)
   target_link_libraries(PortMIDI PRIVATE ${COREAUDIO_LIBRARY} ${COREFOUNDATION_LIBRARY} ${COREMIDI_LIBRARY} ${CORESERVICES_LIBRARY})
 elseif(WIN32)
-  target_sources(PortTime PRIVATE porttime/ptwinmm.c)
+  target_sources(PortTime PRIVATE src/porttime/ptwinmm.c)
   target_link_libraries(PortTime PRIVATE winmm)
-  target_sources(PortMIDI PRIVATE src/windows/pmwin.c src/windows/pmwinmm.c)
+  target_sources(PortMIDI PRIVATE
+    src/portmidi/windows/pmwin.c
+    src/portmidi/windows/pmwinmm.c)
   target_link_libraries(PortMIDI PRIVATE winmm)
 else()
   message(FATAL_ERROR "Operating system not supported.")

diff --git a/src/common/pminternal.h → src/portmidi/common/pminternal.h b/src/common/pminternal.h → src/portmidi/common/pminternal.h
diff --git a/src/common/pmutil.c → src/portmidi/common/pmutil.c b/src/common/pmutil.c → src/portmidi/common/pmutil.c
diff --git a/src/common/portmidi.c → src/portmidi/common/portmidi.c b/src/common/portmidi.c → src/portmidi/common/portmidi.c
diff --git a/src/linux/README_LINUX.txt → src/portmidi/linux/README_LINUX.txt b/src/linux/README_LINUX.txt → src/portmidi/linux/README_LINUX.txt
diff --git a/src/linux/finddefault.c → src/portmidi/linux/finddefault.c b/src/linux/finddefault.c → src/portmidi/linux/finddefault.c
diff --git a/src/linux/pmlinux.c → src/portmidi/linux/pmlinux.c b/src/linux/pmlinux.c → src/portmidi/linux/pmlinux.c
diff --git a/src/linux/pmlinux.h → src/portmidi/linux/pmlinux.h b/src/linux/pmlinux.h → src/portmidi/linux/pmlinux.h
diff --git a/src/linux/pmlinuxalsa.c → src/portmidi/linux/pmlinuxalsa.c b/src/linux/pmlinuxalsa.c → src/portmidi/linux/pmlinuxalsa.c
diff --git a/src/linux/pmlinuxalsa.h → src/portmidi/linux/pmlinuxalsa.h b/src/linux/pmlinuxalsa.h → src/portmidi/linux/pmlinuxalsa.h
diff --git a/src/mac/finddefault.c → src/portmidi/mac/finddefault.c b/src/mac/finddefault.c → src/portmidi/mac/finddefault.c
diff --git a/src/mac/pmmac.c → src/portmidi/mac/pmmac.c b/src/mac/pmmac.c → src/portmidi/mac/pmmac.c
diff --git a/src/mac/pmmac.h → src/portmidi/mac/pmmac.h b/src/mac/pmmac.h → src/portmidi/mac/pmmac.h
diff --git a/src/mac/pmmacosxcm.c → src/portmidi/mac/pmmacosxcm.c b/src/mac/pmmacosxcm.c → src/portmidi/mac/pmmacosxcm.c
diff --git a/src/mac/pmmacosxcm.h → src/portmidi/mac/pmmacosxcm.h b/src/mac/pmmacosxcm.h → src/portmidi/mac/pmmacosxcm.h
diff --git a/src/mac/readbinaryplist.c → src/portmidi/mac/readbinaryplist.c b/src/mac/readbinaryplist.c → src/portmidi/mac/readbinaryplist.c
diff --git a/src/mac/readbinaryplist.h → src/portmidi/mac/readbinaryplist.h b/src/mac/readbinaryplist.h → src/portmidi/mac/readbinaryplist.h
diff --git a/src/windows/pmwin.c → src/portmidi/windows/pmwin.c b/src/windows/pmwin.c → src/portmidi/windows/pmwin.c
diff --git a/src/windows/pmwinmm.c → src/portmidi/windows/pmwinmm.c b/src/windows/pmwinmm.c → src/portmidi/windows/pmwinmm.c
diff --git a/src/windows/pmwinmm.h → src/portmidi/windows/pmwinmm.h b/src/windows/pmwinmm.h → src/portmidi/windows/pmwinmm.h
diff --git a/porttime/porttime.c → src/porttime/porttime.c b/porttime/porttime.c → src/porttime/porttime.c
diff --git a/porttime/ptlinux.c → src/porttime/ptlinux.c b/porttime/ptlinux.c → src/porttime/ptlinux.c
diff --git a/porttime/ptmacosx_cf.c → src/porttime/ptmacosx_cf.c b/porttime/ptmacosx_cf.c → src/porttime/ptmacosx_cf.c
diff --git a/porttime/ptmacosx_mach.c → src/porttime/ptmacosx_mach.c b/porttime/ptmacosx_mach.c → src/porttime/ptmacosx_mach.c
diff --git a/porttime/ptwinmm.c → src/porttime/ptwinmm.c b/porttime/ptwinmm.c → src/porttime/ptwinmm.c