Skip to content

Commit

Permalink
Remove sqlite3 sources and use system installation instead
Browse files Browse the repository at this point in the history
  • Loading branch information
vi3itor committed Jul 20, 2021
1 parent 1415a33 commit 68159a2
Show file tree
Hide file tree
Showing 13 changed files with 8 additions and 257,504 deletions.
8 changes: 5 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ include_directories(${Boost_INCLUDE_DIR})
FIND_PACKAGE(OpenAL REQUIRED)
include_directories(${OPENAL_INCLUDE_DIR})

FIND_PACKAGE(SQLite3 REQUIRED)
include_directories(${SQLite3_INCLUDE_DIRS})

include_directories(${PROJECT_SOURCE_DIR}/src)

# Include the sources
Expand Down Expand Up @@ -86,8 +89,7 @@ set(OWN_LIBRARIES $<TARGET_OBJECTS:baselib> $<TARGET_OBJECTS:systemscommonlib>
$<TARGET_OBJECTS:utilslib> $<TARGET_OBJECTS:gui2lib>)

# Join all created static libraries into the single static one.
add_library(blunted2 ${BLUNTED_CORE_SOURCES} ${LIBS_SOURCES} ${BLUNTED_CORE_HEADERS}
${ALL_LIBS_HEADERS} ${OWN_LIBRARIES})
add_library(blunted2 ${BLUNTED_CORE_SOURCES} ${BLUNTED_CORE_HEADERS} ${OWN_LIBRARIES})

add_library(leaguelib ${LEAGUE_SOURCES} ${LEAGUE_HEADERS})
add_library(gamelib ${GAME_SOURCES} ${GAME_HEADERS})
Expand All @@ -96,7 +98,7 @@ add_library(menulib ${MENU_SOURCES} ${MENU_HEADERS})
add_library(datalib ${DATA_SOURCES} ${DATA_HEADERS})

set(LIBRARIES gamelib hidlib menulib datalib leaguelib blunted2
${Boost_LIBRARIES}
Boost::filesystem Boost::system Boost::thread SQLite::SQLite3
${SDL2_IMAGE_LIBRARIES} ${SDL2_TTF_LIBRARIES} ${SDL2_GFX_LIBRARIES}
${SDL2_LIBRARIES} ${OPENAL_LIBRARY} dl m ${OPENGL_LIBRARIES})

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Install required dependencies:
```bash
sudo apt-get install git cmake build-essential libgl1-mesa-dev libsdl2-dev \
libsdl2-image-dev libsdl2-ttf-dev libsdl2-gfx-dev libopenal-dev libboost-all-dev \
libdirectfb-dev libst-dev mesa-utils xvfb x11vnc
libdirectfb-dev libst-dev mesa-utils xvfb x11vnc libsqlite3-dev
```

Run the following commands:
Expand Down
16 changes: 0 additions & 16 deletions sources.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -363,22 +363,6 @@ set(BLUNTED_CORE_SOURCES
src/blunted.cpp
)

set(LIBS_SQLITE3_HEADERS
src/libs/sqlite3/sqlite3ext.h
src/libs/sqlite3/sqlite3.h
)

set(LIBS_HEADERS

)

set(ALL_LIBS_HEADERS ${LIBS_HEADERS}
${LIBS_SQLITE3_HEADERS})

set(LIBS_SOURCES
src/libs/sqlite3/sqlite3.c
)

set(LEAGUE_HEADERS
src/league/leaguecode.hpp
)
Expand Down
Loading

0 comments on commit 68159a2

Please sign in to comment.