Skip to content

Commit

Permalink
Cleanup: Renamed "sdk" source dir to "libs"
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Sep 1, 2019
1 parent 831163c commit f573786
Show file tree
Hide file tree
Showing 1,119 changed files with 218 additions and 218 deletions.
2 changes: 1 addition & 1 deletion doomsday/CMakeLists.txt
Expand Up @@ -6,7 +6,7 @@ project (Doomsday)

include (cmake/Config.cmake)

add_subdirectory (sdk)
add_subdirectory (libs)
add_subdirectory (apps)
if (NOT IOS)
if (DENG_ENABLE_TOOLS)
Expand Down
2 changes: 1 addition & 1 deletion doomsday/apps/client/src/ui/zonedebug.cpp
Expand Up @@ -35,7 +35,7 @@

/// @todo Find a better way to access the private data of the zone
/// (e.g., move this into the library and use an abstract graphics interface).
#include "../../../sdk/liblegacy/src/memoryzone_private.h"
#include "../../../libs/legacy/src/memoryzone_private.h"

#include "gl/gl_main.h"
#include "gl/gl_draw.h"
Expand Down
2 changes: 1 addition & 1 deletion doomsday/apps/plugins/PluginConfig.cmake
Expand Up @@ -31,7 +31,7 @@ macro (deng_add_plugin target)
add_library (${target} ${_libType} ${_src} ${DENG_RESOURCES})
target_include_directories (${target}
PUBLIC "${DENG_API_DIR}"
PRIVATE "${DENG_SOURCE_DIR}/sdk/libgui/include"
PRIVATE "${DENG_SOURCE_DIR}/libs/gui/include"
)
target_link_libraries (${target} PUBLIC Deng::libdoomsday Deng::libgamefw)
enable_cxx11 (${target})
Expand Down
8 changes: 4 additions & 4 deletions doomsday/build/scripts/Makefile.xcpacks
Expand Up @@ -8,8 +8,8 @@ HERETIC_DATA := {ROOT}/apps/plugins/heretic/data
HEXEN_DATA := {ROOT}/apps/plugins/hexen/data
DOOM64_DATA := ${ROOT}/apps/plugins/doom64/data

STDLIB_FILES := $(shell find $(ROOT)/sdk/libcore/net.dengine.stdlib.pack)
STDLIB_GUI_FILES := $(shell find $(ROOT)/sdk/libgui/net.dengine.stdlib.gui.pack)
STDLIB_FILES := $(shell find $(ROOT)/libs/core/net.dengine.stdlib.pack)
STDLIB_GUI_FILES := $(shell find $(ROOT)/libs/gui/net.dengine.stdlib.gui.pack)
BASE_FILES := $(shell find $(ROOT)/apps/libdoomsday/net.dengine.base.pack)
CLIENT_FILES := $(shell find $(ROOT)/apps/client/net.dengine.client.pack | \
sed -e 's/ /\\ /g')
Expand Down Expand Up @@ -37,10 +37,10 @@ doomsday.pk3 libdoom.pk3 libheretic.pk3 libhexen.pk3: ${PACK_FILES}
cd ${SCRIPTS} && ./packres.py --quiet $(PROJECT_TEMP_DIR)

net.dengine.stdlib.pack: ${STDLIB_FILES}
${SCRIPTS}/buildpackage.py $(ROOT)/sdk/libcore/net.dengine.stdlib.pack $(PROJECT_TEMP_DIR)
${SCRIPTS}/buildpackage.py $(ROOT)/libs/core/net.dengine.stdlib.pack $(PROJECT_TEMP_DIR)

net.dengine.stdlib.gui.pack: ${STDLIB_GUI_FILES}
${SCRIPTS}/buildpackage.py $(ROOT)/sdk/libgui/net.dengine.stdlib.gui.pack $(PROJECT_TEMP_DIR)
${SCRIPTS}/buildpackage.py $(ROOT)/libs/gui/net.dengine.stdlib.gui.pack $(PROJECT_TEMP_DIR)

net.dengine.base.pack: ${BASE_FILES}
${SCRIPTS}/buildpackage.py $(ROOT)/apps/libdoomsday/net.dengine.base.pack $(PROJECT_TEMP_DIR)
Expand Down
13 changes: 13 additions & 0 deletions doomsday/libs/CMakeLists.txt
@@ -0,0 +1,13 @@
# Doomsday SDK

cmake_minimum_required (VERSION 3.1)
project (LIBS)
include (../cmake/Config.cmake)

add_subdirectory (core)
add_subdirectory (shell)
add_subdirectory (legacy)
if (DENG_ENABLE_GUI)
add_subdirectory (gui)
add_subdirectory (appfw)
endif ()
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit f573786

Please sign in to comment.