diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml index 90809eef5..9092d0825 100644 --- a/.github/workflows/build_android.yml +++ b/.github/workflows/build_android.yml @@ -58,7 +58,7 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev llvm-dev libgtest-dev libgmock-dev ninja-build + sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev libgtest-dev libgmock-dev ninja-build - name: Configure Build run: cmake -G "Ninja Multi-Config" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake" -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" -DANDROID_PLATFORM=33 -DANDROID_ABI=arm64-v8a -DCMAKE_VERBOSE_MAKEFILE=YES -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=NO -DENABLE_SDL_UI=OFF diff --git a/.github/workflows/build_emscripten.yml b/.github/workflows/build_emscripten.yml index 087d85345..2bc12135a 100644 --- a/.github/workflows/build_emscripten.yml +++ b/.github/workflows/build_emscripten.yml @@ -37,7 +37,7 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev llvm-dev ninja-build + sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev ninja-build - name: Build GoogleTest From Source run: | diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index e86a22d14..4dac1296b 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -24,7 +24,7 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev llvm-dev libgtest-dev libgmock-dev ninja-build + sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev libgtest-dev libgmock-dev ninja-build - name: Configure Build run: cmake -G "Ninja Multi-Config" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" -DCMAKE_VERBOSE_MAKEFILE=YES -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=YES @@ -61,7 +61,7 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev llvm-dev libgtest-dev libgmock-dev ninja-build + sudo apt-get install -y libgl1-mesa-dev mesa-common-dev libsdl2-dev libglm-dev libgtest-dev libgmock-dev ninja-build - name: Configure Build run: cmake -G "Ninja Multi-Config" -S "${{ github.workspace }}" -B "${{ github.workspace }}/cmake-build" -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/install" -DCMAKE_VERBOSE_MAKEFILE=YES -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=YES diff --git a/BUILDING.md b/BUILDING.md index 18b751e15..d5f0c1bea 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -20,7 +20,6 @@ Optional packages for additional features: ```bash sudo apt install qtbase5-dev # For building Qt-based UIs -sudo apt install llvm-dev # for using the experimental LLVM Jit sudo apt install libvisual-0.4-dev # To build the libvisual plug-in sudo apt install libjack-jackd2-dev # To build the JACK visualizer application sudo apt install ninja # To build projectM with Ninja instead of make diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c0da1c39..199f824bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,6 @@ cmake_dependent_option(ENABLE_INSTALL "Enable installing projectM libraries and option(ENABLE_SYSTEM_GLM "Enable use of system-install GLM library" OFF) # Experimental/unsupported features -cmake_dependent_option(ENABLE_LLVM "Enable experimental LLVM JIT support" OFF "NOT ENABLE_EMSCRIPTEN" OFF) option(ENABLE_CXX_INTERFACE "Enable exporting C++ symbols for ProjectM and PCM classes, not only the C API. Warning: This is not very portable." OFF) if(ENABLE_SYSTEM_GLM) @@ -170,16 +169,6 @@ else() set(PROJECTM_USE_THREADS YES) endif() - if(ENABLE_LLVM) - find_package(LLVM REQUIRED) - if(LLVM_VERSION VERSION_LESS 10.0) - message(FATAL_ERROR "LLVM JIT support requires at least version 10.0, but only ${LLVM_VERSION} was found.") - endif() - set(HAVE_LLVM TRUE) - else() - unset(HAVE_LLVM) - endif() - endif() if(ENABLE_CXX_INTERFACE) @@ -234,10 +223,6 @@ if(ENABLE_SDL_UI) endif() message(STATUS " OpenGL ES: ${ENABLE_GLES}") message(STATUS " Emscripten: ${ENABLE_EMSCRIPTEN}") -message(STATUS " LLVM JIT: ${ENABLE_LLVM}") -if(ENABLE_LLVM) - message(STATUS " LLVM version: ${LLVM_VERSION}") -endif() message(STATUS " Use system GLM: ${ENABLE_SYSTEM_GLM}") message(STATUS " Link UI with shared lib: ${ENABLE_SHARED_LINKING}") message(STATUS "") diff --git a/LLVM_README.md b/LLVM_README.md deleted file mode 100644 index 9bfd8980d..000000000 --- a/LLVM_README.md +++ /dev/null @@ -1,19 +0,0 @@ -### Building with LLVM JIT - -Install the LLVM libraries. I've used llvm-7 so far, see http://apt.llvm.org/ for LLVM repositories. - -``` -sudo apt-get install llvm-7-dev llvm-7-tools -``` - -Then run these commands to configure - -``` -./autogen.sh && ./configure --enable-sdl --enable-qt --enable-llvm --prefix=$PWD/local -``` - -And a clean build of course. - -``` -make clean && make -j4 install -``` diff --git a/cmake/FindLLVM.cmake b/cmake/FindLLVM.cmake deleted file mode 100644 index ba5fd6875..000000000 --- a/cmake/FindLLVM.cmake +++ /dev/null @@ -1,55 +0,0 @@ -# Find and use llvm-config to determine the proper library and include locations. - -find_program(LLVM_CONFIG_COMMAND - NAMES llvm-config llvm-config.exe - ) - -if(LLVM_CONFIG_COMMAND) - execute_process(COMMAND - ${LLVM_CONFIG_COMMAND} --version - OUTPUT_VARIABLE LLVM_VERSION - ) - string(STRIP "${LLVM_VERSION}" LLVM_VERSION) - - execute_process(COMMAND - ${LLVM_CONFIG_COMMAND} --includedir - OUTPUT_VARIABLE LLVM_INCLUDE_DIR - ) - string(STRIP "${LLVM_INCLUDE_DIR}" LLVM_INCLUDE_DIR) - - execute_process(COMMAND - ${LLVM_CONFIG_COMMAND} --libdir - OUTPUT_VARIABLE LLVM_LIB_DIR - ) - string(STRIP "${LLVM_LIB_DIR}" LLVM_LIB_DIR) - - execute_process(COMMAND - ${LLVM_CONFIG_COMMAND} --libs - OUTPUT_VARIABLE LLVM_LIBRARIES - ) - string(STRIP "${LLVM_LIBRARIES}" LLVM_LIBRARIES) - - execute_process(COMMAND - ${LLVM_CONFIG_COMMAND} --ldflags - OUTPUT_VARIABLE LLVM_LDFLAGS - ) - string(STRIP "${LLVM_LDFLAGS}" LLVM_LDFLAGS) -endif() - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(LLVM - REQUIRED_VARS LLVM_CONFIG_COMMAND LLVM_LIBRARIES LLVM_LIB_DIR LLVM_INCLUDE_DIR LLVM_LDFLAGS - VERSION_VAR LLVM_VERSION - ) - -if(LLVM_FOUND AND NOT TARGET LLVM::LLVM) - add_library(LLVM::LLVM INTERFACE IMPORTED) - - set_target_properties(LLVM::LLVM PROPERTIES - INTERFACE_LINK_LIBRARIES "${LLVM_LIBRARIES}" - INTERFACE_LINK_DIRECTORIES "${LLVM_LIB_DIR}" - INTERFACE_INCLUDE_DIRECTORIES "${LLVM_INCLUDE_DIR}" - INTERFACE_LINK_OPTIONS "${LLVM_LDFLAGS}" - ) -endif() diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt index f01321905..14ff4b52b 100644 --- a/src/libprojectM/CMakeLists.txt +++ b/src/libprojectM/CMakeLists.txt @@ -87,13 +87,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") ) endif() -if(ENABLE_LLVM) - target_link_libraries(projectM - PUBLIC - LLVM::LLVM - ) -endif() - set_target_properties(projectM PROPERTIES VERSION "${PROJECTM_LIB_VERSION}" SOVERSION "${PROJECTM_SO_VERSION}" @@ -203,15 +196,6 @@ if(ENABLE_INSTALL) ) endif() - if(ENABLE_LLVM) - install(FILES - "${PROJECTM_SOURCE_DIR}/cmake/gles/FindLLVM.cmake" - DESTINATION "${PROJECTM_LIB_DIR}/cmake/projectM4" - COMPONENT Devel - ) - endif() - - install(EXPORT libprojectMTargets FILE projectM4Targets.cmake NAMESPACE libprojectM:: @@ -223,10 +207,6 @@ if(ENABLE_INSTALL) if(UNIX) include(GeneratePkgConfigFiles) - if(ENABLE_LLVM) - set(PKGCONFIG_LIBS "${PKGCONFIG_LIBS} -L${LLVM_LIB_DIR} ${LLVM_LIBRARIES}") - endif() - set(PKGCONFIG_PACKAGE_NAME "${PROJECTM_LIBRARY_BASE_OUTPUT_NAME}") set(PKGCONFIG_PACKAGE_DESCRIPTION "projectM Music Visualizer") set(PKGCONFIG_PACKAGE_REQUIREMENTS_ALL "opengl") diff --git a/src/libprojectM/MilkdropPreset/CMakeLists.txt b/src/libprojectM/MilkdropPreset/CMakeLists.txt index 09afa91b5..8dfb147ad 100644 --- a/src/libprojectM/MilkdropPreset/CMakeLists.txt +++ b/src/libprojectM/MilkdropPreset/CMakeLists.txt @@ -163,10 +163,3 @@ endif() set_target_properties(MilkdropPreset PROPERTIES FOLDER libprojectM ) - -if(ENABLE_LLVM) - target_link_libraries(MilkdropPreset - PUBLIC - LLVM::LLVM - ) -endif() diff --git a/src/libprojectM/projectM4Config.cmake.in b/src/libprojectM/projectM4Config.cmake.in index 2e561d224..8c74e01b5 100644 --- a/src/libprojectM/projectM4Config.cmake.in +++ b/src/libprojectM/projectM4Config.cmake.in @@ -12,10 +12,6 @@ if(NOT "@ENABLE_EMSCRIPTEN@") # ENABLE_EMSCRIPTEN find_dependency(OpenGL) endif() endif() -if("@ENABLE_LLVM@") # ENABLE_LLVM - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") - find_dependency(LLVM) -endif() if("@ENABLE_THREADING@") # ENABLE_THREADING find_dependency(Threads) endif()