Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ jobs:
run: |
New-Item -ItemType Directory -Force -Path package
Copy-Item build/Release/RocketEditor.exe package/
Copy-Item external/bass/win64/bass.dll package/
Compress-Archive -Path package/* -DestinationPath RocketEditor-Windows.zip

- name: Upload artifact
Expand Down
32 changes: 11 additions & 21 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ set(VERSION_PATCH "0")

set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})


if (APPLE)
add_definitions(-DMACOSX -DEMGUI_MACOSX)
add_compile_options(-Wall -Wno-format-security -Wno-deprecated-declarations)
Expand Down Expand Up @@ -71,19 +72,16 @@ set(RKT_PROJECT_INCLUDES ${RKT_PROJECT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/ext
set(RKT_PROJECT_LIBS ${RKT_PROJECT_LIBS} rkt_tinycthread)

##############################################################################
# BASS
set(RKT_PROJECT_INCLUDES ${RKT_PROJECT_INCLUDES} ${CMAKE_SOURCE_DIR}/external/bass)
if (APPLE)
set(RKT_PROJECT_LIBS ${RKT_PROJECT_LIBS} ${CMAKE_SOURCE_DIR}/external/bass/mac/libbass.dylib)
elseif (UNIX)
set(RKT_PROJECT_LIBS ${RKT_PROJECT_LIBS} ${CMAKE_SOURCE_DIR}/external/bass/linux/libbass.so)
elseif (MSVC)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(RKT_PROJECT_LIBS ${RKT_PROJECT_LIBS} ${CMAKE_SOURCE_DIR}/external/bass/win64/bass.lib)
else()
set(RKT_PROJECT_LIBS ${RKT_PROJECT_LIBS} ${CMAKE_SOURCE_DIR}/external/bass/win32/bass.lib)
endif()
endif ()
# AUDIO DECODING (minimp3+kissfft)

# kissfft library
add_library(rkt_kissfft ${CMAKE_SOURCE_DIR}/external/kissfft/kiss_fft.c)
target_include_directories(rkt_kissfft PUBLIC ${CMAKE_SOURCE_DIR}/external/kissfft)
set(RKT_PROJECT_LIBS ${RKT_PROJECT_LIBS} rkt_kissfft)

# minimp3 is header-only
set(RKT_PROJECT_INCLUDES ${RKT_PROJECT_INCLUDES} ${CMAKE_SOURCE_DIR}/external/minimp3)
set(RKT_PROJECT_INCLUDES ${RKT_PROJECT_INCLUDES} ${CMAKE_SOURCE_DIR}/external/kissfft)

##############################################################################
# EMGUI
Expand Down Expand Up @@ -185,10 +183,6 @@ if (APPLE)

set_source_files_properties(${RKT_RESOURCES_DATA} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)

set(OSX_LIB_FILES ${CMAKE_SOURCE_DIR}/external/bass/mac/libbass.dylib)
set_source_files_properties(${OSX_LIB_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS)
set(RKT_PROJECT_SRCS ${RKT_PROJECT_SRCS} ${OSX_LIB_FILES})

set(RKT_PROJECT_SRCS ${GUI_TYPE} ${RKT_PROJECT_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/data/macosx/appnib.xib)

find_library(COCOA_FRAMEWORK Cocoa)
Expand Down Expand Up @@ -250,10 +244,6 @@ if (APPLE)
COMMENT "Compiling appnib.xib")
endif ()

# move the bass dll close to the executable
if (MSVC)
add_custom_command(TARGET ${RKT_EXE_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/external/bass/win32/bass.dll" $<TARGET_FILE_DIR:${RKT_EXE_NAME}>)
endif ()


##############################################################################
Expand Down
12 changes: 1 addition & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,10 @@ cd rocket
tundra2 linux-gcc-release
```

(optional) Install `libbass.so` from the repo folder:

```
sudo cp external/bass/linux/libbass.so /usr/local/lib/
sudo chmod a+rx /usr/local/lib/libbass.so
sudo ldconfig
```



Start rocket:

```
LD_LIBRARY_PATH=external/bass/linux/ ./t2-output/linux-gcc-release-default/editor
./t2-output/linux-gcc-release-default/editor
```
Start the basic example:

Expand Down
Loading