From f5cc137b402280069b1b327bafba548b483f07fe Mon Sep 17 00:00:00 2001 From: Cerapter Date: Mon, 26 Apr 2021 21:14:25 +0200 Subject: [PATCH] Rename `lib` to `core`. On Linux, the resulting shared library would have been called `liblib`, which is just dumb. --- akashi.pro | 2 +- akashi/akashi.pro | 8 ++++---- lib/lib.pro => core/core.pro | 0 {lib => core}/include/advertiser.h | 0 {lib => core}/include/aoclient.h | 0 {lib => core}/include/aopacket.h | 0 {lib => core}/include/area_data.h | 0 {lib => core}/include/config_manager.h | 0 {lib => core}/include/db_manager.h | 0 {lib => core}/include/logger.h | 0 {lib => core}/include/server.h | 0 {lib => core}/include/ws_client.h | 0 {lib => core}/include/ws_proxy.h | 0 {lib => core}/src/advertiser.cpp | 0 {lib => core}/src/aoclient.cpp | 0 {lib => core}/src/aopacket.cpp | 0 {lib => core}/src/area_data.cpp | 0 {lib => core}/src/commands/area.cpp | 0 {lib => core}/src/commands/authentication.cpp | 0 {lib => core}/src/commands/casing.cpp | 0 {lib => core}/src/commands/command_helper.cpp | 0 {lib => core}/src/commands/messaging.cpp | 0 {lib => core}/src/commands/moderation.cpp | 0 {lib => core}/src/commands/music.cpp | 0 {lib => core}/src/commands/roleplay.cpp | 0 {lib => core}/src/config_manager.cpp | 0 {lib => core}/src/db_manager.cpp | 0 {lib => core}/src/logger.cpp | 0 {lib => core}/src/packets.cpp | 0 {lib => core}/src/server.cpp | 0 {lib => core}/src/testimony_recorder.cpp | 0 {lib => core}/src/ws_client.cpp | 0 {lib => core}/src/ws_proxy.cpp | 0 tests/tests_common.pri | 8 ++++---- 34 files changed, 9 insertions(+), 9 deletions(-) rename lib/lib.pro => core/core.pro (100%) rename {lib => core}/include/advertiser.h (100%) rename {lib => core}/include/aoclient.h (100%) rename {lib => core}/include/aopacket.h (100%) rename {lib => core}/include/area_data.h (100%) rename {lib => core}/include/config_manager.h (100%) rename {lib => core}/include/db_manager.h (100%) rename {lib => core}/include/logger.h (100%) rename {lib => core}/include/server.h (100%) rename {lib => core}/include/ws_client.h (100%) rename {lib => core}/include/ws_proxy.h (100%) rename {lib => core}/src/advertiser.cpp (100%) rename {lib => core}/src/aoclient.cpp (100%) rename {lib => core}/src/aopacket.cpp (100%) rename {lib => core}/src/area_data.cpp (100%) rename {lib => core}/src/commands/area.cpp (100%) rename {lib => core}/src/commands/authentication.cpp (100%) rename {lib => core}/src/commands/casing.cpp (100%) rename {lib => core}/src/commands/command_helper.cpp (100%) rename {lib => core}/src/commands/messaging.cpp (100%) rename {lib => core}/src/commands/moderation.cpp (100%) rename {lib => core}/src/commands/music.cpp (100%) rename {lib => core}/src/commands/roleplay.cpp (100%) rename {lib => core}/src/config_manager.cpp (100%) rename {lib => core}/src/db_manager.cpp (100%) rename {lib => core}/src/logger.cpp (100%) rename {lib => core}/src/packets.cpp (100%) rename {lib => core}/src/server.cpp (100%) rename {lib => core}/src/testimony_recorder.cpp (100%) rename {lib => core}/src/ws_client.cpp (100%) rename {lib => core}/src/ws_proxy.cpp (100%) diff --git a/akashi.pro b/akashi.pro index 408bfdf..119f6c0 100644 --- a/akashi.pro +++ b/akashi.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs SUBDIRS += \ - lib \ + core \ akashi \ tests diff --git a/akashi/akashi.pro b/akashi/akashi.pro index 5524e2a..fe91621 100644 --- a/akashi/akashi.pro +++ b/akashi/akashi.pro @@ -26,8 +26,8 @@ RC_ICONS = resource/icon/akashi.ico SOURCES += main.cpp # Include the akashi library -win32: LIBS += -L$$PWD/../bin/ -llib -else:unix: LIBS += -L$$PWD/../bin/ -llib +win32: LIBS += -L$$PWD/../bin/ -lcore +else:unix: LIBS += -L$$PWD/../bin/ -lcore -INCLUDEPATH += $$PWD/../lib -DEPENDPATH += $$PWD/../lib +INCLUDEPATH += $$PWD/../core +DEPENDPATH += $$PWD/../core diff --git a/lib/lib.pro b/core/core.pro similarity index 100% rename from lib/lib.pro rename to core/core.pro diff --git a/lib/include/advertiser.h b/core/include/advertiser.h similarity index 100% rename from lib/include/advertiser.h rename to core/include/advertiser.h diff --git a/lib/include/aoclient.h b/core/include/aoclient.h similarity index 100% rename from lib/include/aoclient.h rename to core/include/aoclient.h diff --git a/lib/include/aopacket.h b/core/include/aopacket.h similarity index 100% rename from lib/include/aopacket.h rename to core/include/aopacket.h diff --git a/lib/include/area_data.h b/core/include/area_data.h similarity index 100% rename from lib/include/area_data.h rename to core/include/area_data.h diff --git a/lib/include/config_manager.h b/core/include/config_manager.h similarity index 100% rename from lib/include/config_manager.h rename to core/include/config_manager.h diff --git a/lib/include/db_manager.h b/core/include/db_manager.h similarity index 100% rename from lib/include/db_manager.h rename to core/include/db_manager.h diff --git a/lib/include/logger.h b/core/include/logger.h similarity index 100% rename from lib/include/logger.h rename to core/include/logger.h diff --git a/lib/include/server.h b/core/include/server.h similarity index 100% rename from lib/include/server.h rename to core/include/server.h diff --git a/lib/include/ws_client.h b/core/include/ws_client.h similarity index 100% rename from lib/include/ws_client.h rename to core/include/ws_client.h diff --git a/lib/include/ws_proxy.h b/core/include/ws_proxy.h similarity index 100% rename from lib/include/ws_proxy.h rename to core/include/ws_proxy.h diff --git a/lib/src/advertiser.cpp b/core/src/advertiser.cpp similarity index 100% rename from lib/src/advertiser.cpp rename to core/src/advertiser.cpp diff --git a/lib/src/aoclient.cpp b/core/src/aoclient.cpp similarity index 100% rename from lib/src/aoclient.cpp rename to core/src/aoclient.cpp diff --git a/lib/src/aopacket.cpp b/core/src/aopacket.cpp similarity index 100% rename from lib/src/aopacket.cpp rename to core/src/aopacket.cpp diff --git a/lib/src/area_data.cpp b/core/src/area_data.cpp similarity index 100% rename from lib/src/area_data.cpp rename to core/src/area_data.cpp diff --git a/lib/src/commands/area.cpp b/core/src/commands/area.cpp similarity index 100% rename from lib/src/commands/area.cpp rename to core/src/commands/area.cpp diff --git a/lib/src/commands/authentication.cpp b/core/src/commands/authentication.cpp similarity index 100% rename from lib/src/commands/authentication.cpp rename to core/src/commands/authentication.cpp diff --git a/lib/src/commands/casing.cpp b/core/src/commands/casing.cpp similarity index 100% rename from lib/src/commands/casing.cpp rename to core/src/commands/casing.cpp diff --git a/lib/src/commands/command_helper.cpp b/core/src/commands/command_helper.cpp similarity index 100% rename from lib/src/commands/command_helper.cpp rename to core/src/commands/command_helper.cpp diff --git a/lib/src/commands/messaging.cpp b/core/src/commands/messaging.cpp similarity index 100% rename from lib/src/commands/messaging.cpp rename to core/src/commands/messaging.cpp diff --git a/lib/src/commands/moderation.cpp b/core/src/commands/moderation.cpp similarity index 100% rename from lib/src/commands/moderation.cpp rename to core/src/commands/moderation.cpp diff --git a/lib/src/commands/music.cpp b/core/src/commands/music.cpp similarity index 100% rename from lib/src/commands/music.cpp rename to core/src/commands/music.cpp diff --git a/lib/src/commands/roleplay.cpp b/core/src/commands/roleplay.cpp similarity index 100% rename from lib/src/commands/roleplay.cpp rename to core/src/commands/roleplay.cpp diff --git a/lib/src/config_manager.cpp b/core/src/config_manager.cpp similarity index 100% rename from lib/src/config_manager.cpp rename to core/src/config_manager.cpp diff --git a/lib/src/db_manager.cpp b/core/src/db_manager.cpp similarity index 100% rename from lib/src/db_manager.cpp rename to core/src/db_manager.cpp diff --git a/lib/src/logger.cpp b/core/src/logger.cpp similarity index 100% rename from lib/src/logger.cpp rename to core/src/logger.cpp diff --git a/lib/src/packets.cpp b/core/src/packets.cpp similarity index 100% rename from lib/src/packets.cpp rename to core/src/packets.cpp diff --git a/lib/src/server.cpp b/core/src/server.cpp similarity index 100% rename from lib/src/server.cpp rename to core/src/server.cpp diff --git a/lib/src/testimony_recorder.cpp b/core/src/testimony_recorder.cpp similarity index 100% rename from lib/src/testimony_recorder.cpp rename to core/src/testimony_recorder.cpp diff --git a/lib/src/ws_client.cpp b/core/src/ws_client.cpp similarity index 100% rename from lib/src/ws_client.cpp rename to core/src/ws_client.cpp diff --git a/lib/src/ws_proxy.cpp b/core/src/ws_proxy.cpp similarity index 100% rename from lib/src/ws_proxy.cpp rename to core/src/ws_proxy.cpp diff --git a/tests/tests_common.pri b/tests/tests_common.pri index 9a8aada..f9dc917 100644 --- a/tests/tests_common.pri +++ b/tests/tests_common.pri @@ -5,8 +5,8 @@ CONFIG -= app_bundle DESTDIR = $$PWD/../bin_tests -win32: LIBS += -L$$PWD/../bin/ -llib -else:unix: LIBS += -L$$PWD/../bin/ -llib +win32: LIBS += -L$$PWD/../bin/ -lcore +else:unix: LIBS += -L$$PWD/../bin/ -lcore -INCLUDEPATH += $$PWD/../lib -DEPENDPATH += $$PWD/../lib +INCLUDEPATH += $$PWD/../core +DEPENDPATH += $$PWD/../core