Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
biscuitcakes committed Mar 4, 2024
1 parent 540bfc4 commit fda6a57
Show file tree
Hide file tree
Showing 45 changed files with 170 additions and 25,214 deletions.
10 changes: 2 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ add_library(firelight_lib
src/app/libretro/coreoption.hpp
src/app/libretro/game.cpp
src/app/libretro/game.hpp
src/app/saves/save_manager.cpp
src/app/saves/save_manager.hpp
src/app/patching/pm_star_rod_mod_patch.cpp
src/app/patching/yay_0_codec.cpp
src/app/patching/yay_0_codec.hpp
Expand Down Expand Up @@ -114,7 +112,7 @@ add_library(firelight_lib
src/gui/playlist_item_model.hpp
)

target_include_directories(firelight_lib PRIVATE includes ${SDL2_INCLUDE_DIRS}
target_include_directories(firelight_lib PRIVATE ${SDL2_INCLUDE_DIRS}
${SQLite3_INCLUDE_DIRS})
target_link_libraries(firelight_lib mingw32 SDL2 opengl32 ssl crypto z ${SQLite3_LIBRARIES}
Qt6::Gui Qt6::Quick Qt6::OpenGL Qt6::QuickControls2 Qt6::Quick3D Qt6::Sql spdlog::spdlog)
Expand Down Expand Up @@ -154,7 +152,7 @@ qt6_add_qml_module(firelight
${QML_FILES}
)

target_include_directories(firelight PRIVATE includes ${SDL2_INCLUDE_DIRS}
target_include_directories(firelight PRIVATE ${SDL2_INCLUDE_DIRS}
${SQLite3_INCLUDE_DIRS})
target_link_libraries(firelight PRIVATE firelight_lib)

Expand Down Expand Up @@ -239,10 +237,6 @@ get_filename_component(MINGW_DIR ${MINGW_PATH} DIRECTORY)
set(SHARED_LIB_DIR "${MINGW_DIR}")
message("Shared Library Directory: ${SHARED_LIB_DIR}")

#if (NOT DEFINED ENV{SHARED_LIB_DIR})
# set(ENV{SHARED_LIB_DIR} "C:/msys64/mingw64/bin")
#endif ()

install(
PROGRAMS
${CMAKE_BINARY_DIR}/firelight_style.dll
Expand Down
101 changes: 0 additions & 101 deletions build-windows-testing.sh

This file was deleted.

Loading

0 comments on commit fda6a57

Please sign in to comment.