Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Feature/MUI #44

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

[WIP] Feature/MUI #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5ca90f
MilkyPlayer initial commit
MBeijer Jun 7, 2020
6e4761a
MilkyPlay playback works in this commit
MBeijer Jun 7, 2020
686f796
Remove unnecessary files + Cleanup
MBeijer Jun 7, 2020
b445ca8
Add some controller buttons for open, play and stop
MBeijer Jun 7, 2020
9595a5e
Minor changes
MBeijer Jun 7, 2020
18594a5
Properly dispose of all objects
MBeijer Jun 9, 2020
362d622
Initial MED loader (dirty)
MBeijer Jul 12, 2020
5de592b
Remove dependency of SDL for byteswap
MBeijer Jul 12, 2020
314d7b1
MUI stuff
MBeijer Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ CMakeFiles
.idea/
build-*/
cmake-*
src/submodules/*SDL*
src/submodules/*sdl*
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ cmake_minimum_required(VERSION 3.10)
project(MilkyTracker)

# Set C++ standard to C++98
set(CMAKE_CXX_STANDARD 98)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_EXTENSIONS OFF)

# Enable IDE solution folders
Expand Down Expand Up @@ -186,8 +186,12 @@ elseif(WIN32)
add_subdirectory(src/midi)
elseif(AROS)
# AROS will provide the SDL dependency via makefile.
elseif(AMIGA)
elseif(AMIGA OR SDL12)
find_package(SDL 1.2 REQUIRED)
set(SDL2_INCLUDE_DIRS ${SDL_INCLUDE_DIR})
message("Set SDL12")
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/lib)
else()
# Workaround for SDL bug #3295, which occurs in SDL2 <2.0.5
# https://bugzilla.libsdl.org/show_bug.cgi?id=3295
Expand Down Expand Up @@ -245,6 +249,7 @@ add_subdirectory(src/fx)
add_subdirectory(src/milkyplay)
add_subdirectory(src/ppui)
add_subdirectory(src/tracker)
add_subdirectory(src/milkyplayer)

# Set MilkyTracker target as startup project in Visual Studio
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT tracker)
2 changes: 1 addition & 1 deletion cmake/FindSDL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ find_library(SDL_LIBRARY_TEMP
NAMES SDL SDL-1.1 SDL_wos
HINTS
ENV SDLDIR
PATH_SUFFIXES lib ppc-amigaos/newlib/lib ${VC_LIB_PATH_SUFFIX}
PATH_SUFFIXES lib ppc-amigaos/newlib/lib usr/ ${VC_LIB_PATH_SUFFIX}
)

# Hide this cache variable from the user, it's an internal implementation
Expand Down
6 changes: 5 additions & 1 deletion src/milkyplay/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ add_library(milkyplay STATIC
LoaderIT.cpp
LoaderMDL.cpp
LoaderMOD.cpp
LoaderMED.cpp
LoaderMTM.cpp
LoaderMXM.cpp
LoaderOKT.cpp
Expand Down Expand Up @@ -138,16 +139,19 @@ if(APPLE)
${CORE_FOUNDATION_LIBRARY}
)
message(STATUS "Enabled Core Audio support")
elseif(AROS OR AMIGA)
elseif(AROS OR AMIGA OR SDL12)
target_sources(milkyplay
PRIVATE
# Sources
drivers/sdl/AudioDriver_SDL.cpp
#drivers/amiga/AudioDriver_AHI.cpp
# Headers
drivers/sdl/AudioDriver_SDL.h
#drivers/amiga/AudioDriver_AHI.h
)
target_include_directories(milkyplay PRIVATE
drivers/sdl
drivers/amiga
${SDL_INCLUDE_DIR}
)
target_link_libraries(milkyplay PUBLIC ${SDL_LIBRARY})
Expand Down
Loading