mirror of
https://github.com/rwengine/openrw.git
synced 2024-10-06 09:07:19 +02:00
Rename rwlib library to "core" to fit its new role
Also move up source files into the root directory, as there's nothing else in this directory
This commit is contained in:
parent
be2816c398
commit
4fd92a1549
@ -66,7 +66,7 @@ endif()
|
||||
# Create a rw_interface TARGET that holds all compiler options
|
||||
include("${PROJECT_SOURCE_DIR}/cmake_configure.cmake")
|
||||
|
||||
add_subdirectory(rwlib)
|
||||
add_subdirectory(rwcore)
|
||||
add_subdirectory(rwengine)
|
||||
add_subdirectory(rwgame)
|
||||
|
||||
|
68
rwcore/CMakeLists.txt
Normal file
68
rwcore/CMakeLists.txt
Normal file
@ -0,0 +1,68 @@
|
||||
|
||||
add_library(rwcore
|
||||
# GL stuff is only here temporarily, hoping to move it back to rwengine
|
||||
gl/gl_core_3_3.c
|
||||
gl/gl_core_3_3.h
|
||||
gl/DrawBuffer.hpp
|
||||
gl/DrawBuffer.cpp
|
||||
gl/GeometryBuffer.hpp
|
||||
gl/GeometryBuffer.cpp
|
||||
gl/TextureData.hpp
|
||||
gl/TextureData.cpp
|
||||
|
||||
rw/abort.cpp
|
||||
rw/casts.hpp
|
||||
rw/filesystem.hpp
|
||||
rw/forward.hpp
|
||||
rw/types.hpp
|
||||
rw/debug.hpp
|
||||
|
||||
platform/FileHandle.hpp
|
||||
platform/FileIndex.hpp
|
||||
platform/FileIndex.cpp
|
||||
|
||||
data/Clump.hpp
|
||||
data/Clump.cpp
|
||||
|
||||
fonts/FontMap.cpp
|
||||
fonts/FontMap.hpp
|
||||
fonts/FontMapGta3.cpp
|
||||
fonts/FontMapGta3.hpp
|
||||
fonts/GameTexts.cpp
|
||||
fonts/GameTexts.hpp
|
||||
fonts/Unicode.cpp
|
||||
fonts/Unicode.hpp
|
||||
|
||||
loaders/LoaderIMG.hpp
|
||||
loaders/LoaderIMG.cpp
|
||||
loaders/RWBinaryStream.hpp
|
||||
loaders/LoaderDFF.hpp
|
||||
loaders/LoaderDFF.cpp
|
||||
loaders/LoaderSDT.hpp
|
||||
loaders/LoaderSDT.cpp
|
||||
loaders/LoaderTXD.hpp
|
||||
loaders/LoaderTXD.cpp
|
||||
)
|
||||
|
||||
target_include_directories(rwcore
|
||||
PUBLIC
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}"
|
||||
)
|
||||
|
||||
target_link_libraries(rwcore
|
||||
PUBLIC
|
||||
rwdep::boost
|
||||
rwdep::glm
|
||||
openrw::interface
|
||||
PRIVATE
|
||||
OpenGL::GL
|
||||
)
|
||||
|
||||
openrw_target_apply_options(TARGET rwcore)
|
||||
|
||||
if(BUILD_SHARED_LIBS)
|
||||
install(TARGETS rwcore
|
||||
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
)
|
||||
endif()
|
@ -146,7 +146,7 @@ add_library(rwengine
|
||||
|
||||
target_link_libraries(rwengine
|
||||
PUBLIC
|
||||
rwlib
|
||||
rwcore
|
||||
rwdep::bullet
|
||||
rwdep::ffmpeg
|
||||
rwdep::glm
|
||||
|
@ -1,80 +0,0 @@
|
||||
###########################################################
|
||||
## RWLIB
|
||||
###########################################################
|
||||
|
||||
SET(RWLIB_SOURCES
|
||||
# GL stuff is only here temporarily, hoping to move it back to rwengine
|
||||
source/gl/gl_core_3_3.c
|
||||
source/gl/gl_core_3_3.h
|
||||
source/gl/DrawBuffer.hpp
|
||||
source/gl/DrawBuffer.cpp
|
||||
source/gl/GeometryBuffer.hpp
|
||||
source/gl/GeometryBuffer.cpp
|
||||
source/gl/TextureData.hpp
|
||||
source/gl/TextureData.cpp
|
||||
|
||||
source/rw/abort.cpp
|
||||
source/rw/casts.hpp
|
||||
source/rw/filesystem.hpp
|
||||
source/rw/forward.hpp
|
||||
source/rw/types.hpp
|
||||
source/rw/debug.hpp
|
||||
|
||||
source/platform/FileHandle.hpp
|
||||
source/platform/FileIndex.hpp
|
||||
source/platform/FileIndex.cpp
|
||||
|
||||
source/data/Clump.hpp
|
||||
source/data/Clump.cpp
|
||||
|
||||
source/fonts/FontMap.cpp
|
||||
source/fonts/FontMap.hpp
|
||||
source/fonts/FontMapGta3.cpp
|
||||
source/fonts/FontMapGta3.hpp
|
||||
source/fonts/GameTexts.cpp
|
||||
source/fonts/GameTexts.hpp
|
||||
source/fonts/Unicode.cpp
|
||||
source/fonts/Unicode.hpp
|
||||
|
||||
source/loaders/LoaderIMG.hpp
|
||||
source/loaders/LoaderIMG.cpp
|
||||
source/loaders/RWBinaryStream.hpp
|
||||
source/loaders/LoaderDFF.hpp
|
||||
source/loaders/LoaderDFF.cpp
|
||||
source/loaders/LoaderSDT.hpp
|
||||
source/loaders/LoaderSDT.cpp
|
||||
source/loaders/LoaderTXD.hpp
|
||||
source/loaders/LoaderTXD.cpp
|
||||
)
|
||||
|
||||
add_library(rwlib
|
||||
${RWLIB_SOURCES}
|
||||
)
|
||||
|
||||
target_include_directories(rwlib
|
||||
PUBLIC
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/source"
|
||||
)
|
||||
|
||||
target_link_libraries(rwlib
|
||||
PUBLIC
|
||||
rwdep::boost
|
||||
rwdep::glm
|
||||
openrw::interface
|
||||
PRIVATE
|
||||
OpenGL::GL
|
||||
)
|
||||
|
||||
set_target_properties(rwlib
|
||||
PROPERTIES
|
||||
OUTPUT_NAME rw
|
||||
)
|
||||
|
||||
openrw_target_apply_options(TARGET rwlib)
|
||||
|
||||
if(BUILD_SHARED_LIBS)
|
||||
install(TARGETS rwlib
|
||||
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
||||
)
|
||||
endif()
|
Loading…
Reference in New Issue
Block a user