diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt index 9a9a3d27..fbc8d294 100644 --- a/neo/CMakeLists.txt +++ b/neo/CMakeLists.txt @@ -593,8 +593,8 @@ list(REMOVE_ITEM DOOMCLASSIC_SOURCES ../doomclassic/doom/i_net_xbox.cpp) list(REMOVE_ITEM DOOMCLASSIC_SOURCES ../doomclassic/doom/i_video_ps3.cpp) list(REMOVE_ITEM DOOMCLASSIC_SOURCES ../doomclassic/doom/i_video_xbox.cpp) -file(GLOB TIMIDITY_INCLUDES ../doomclassic/timidity/*.h) -file(GLOB TIMIDITY_SOURCES ../doomclassic/timidity/*.cpp) +file(GLOB TIMIDITY_INCLUDES libs/timidity/*.h) +file(GLOB TIMIDITY_SOURCES libs/timidity/*.cpp) file(GLOB_RECURSE WIN32_INCLUDES sys/win32/*.h) file(GLOB_RECURSE WIN32_SOURCES sys/win32/*.cpp) @@ -724,8 +724,8 @@ source_group("sys" FILES ${SYS_SOURCES}) source_group("doomclassic" FILES ${DOOMCLASSIC_INCLUDES}) source_group("doomclassic" FILES ${DOOMCLASSIC_SOURCES}) -source_group("timidity" FILES ${TIMIDITY_INCLUDES}) -source_group("timidity" FILES ${TIMIDITY_SOURCES}) +source_group("libs\\timidity" FILES ${TIMIDITY_INCLUDES}) +source_group("libs\\timidity" FILES ${TIMIDITY_SOURCES}) source_group("game-d3xp" FILES ${GAMED3XP_INCLUDES}) diff --git a/doomclassic/timidity/FAQ b/neo/libs/timidity/FAQ similarity index 100% rename from doomclassic/timidity/FAQ rename to neo/libs/timidity/FAQ diff --git a/doomclassic/timidity/README b/neo/libs/timidity/README similarity index 100% rename from doomclassic/timidity/README rename to neo/libs/timidity/README diff --git a/doomclassic/timidity/common.cpp b/neo/libs/timidity/common.cpp similarity index 99% rename from doomclassic/timidity/common.cpp rename to neo/libs/timidity/common.cpp index bc80cc80..fe22de18 100644 --- a/doomclassic/timidity/common.cpp +++ b/neo/libs/timidity/common.cpp @@ -21,7 +21,7 @@ common.c */ -#include "../../neo/idlib/precompiled.h" +#include "../../idlib/precompiled.h" #include #include diff --git a/doomclassic/timidity/common.h b/neo/libs/timidity/common.h similarity index 100% rename from doomclassic/timidity/common.h rename to neo/libs/timidity/common.h diff --git a/doomclassic/timidity/config.h b/neo/libs/timidity/config.h similarity index 100% rename from doomclassic/timidity/config.h rename to neo/libs/timidity/config.h diff --git a/doomclassic/timidity/controls.cpp b/neo/libs/timidity/controls.cpp similarity index 100% rename from doomclassic/timidity/controls.cpp rename to neo/libs/timidity/controls.cpp diff --git a/doomclassic/timidity/controls.h b/neo/libs/timidity/controls.h similarity index 100% rename from doomclassic/timidity/controls.h rename to neo/libs/timidity/controls.h diff --git a/doomclassic/timidity/filter.cpp b/neo/libs/timidity/filter.cpp similarity index 100% rename from doomclassic/timidity/filter.cpp rename to neo/libs/timidity/filter.cpp diff --git a/doomclassic/timidity/filter.h b/neo/libs/timidity/filter.h similarity index 100% rename from doomclassic/timidity/filter.h rename to neo/libs/timidity/filter.h diff --git a/doomclassic/timidity/instrum.cpp b/neo/libs/timidity/instrum.cpp similarity index 99% rename from doomclassic/timidity/instrum.cpp rename to neo/libs/timidity/instrum.cpp index d5068f3b..81e4f428 100644 --- a/doomclassic/timidity/instrum.cpp +++ b/neo/libs/timidity/instrum.cpp @@ -23,7 +23,7 @@ Code to load and unload GUS-compatible instrument patches. */ -#include "../../neo/idlib/precompiled.h" +#include "../../idlib/precompiled.h" #include #include diff --git a/doomclassic/timidity/instrum.h b/neo/libs/timidity/instrum.h similarity index 100% rename from doomclassic/timidity/instrum.h rename to neo/libs/timidity/instrum.h diff --git a/doomclassic/timidity/mix.cpp b/neo/libs/timidity/mix.cpp similarity index 100% rename from doomclassic/timidity/mix.cpp rename to neo/libs/timidity/mix.cpp diff --git a/doomclassic/timidity/mix.h b/neo/libs/timidity/mix.h similarity index 100% rename from doomclassic/timidity/mix.h rename to neo/libs/timidity/mix.h diff --git a/doomclassic/timidity/output.cpp b/neo/libs/timidity/output.cpp similarity index 100% rename from doomclassic/timidity/output.cpp rename to neo/libs/timidity/output.cpp diff --git a/doomclassic/timidity/output.h b/neo/libs/timidity/output.h similarity index 100% rename from doomclassic/timidity/output.h rename to neo/libs/timidity/output.h diff --git a/doomclassic/timidity/playmidi.cpp b/neo/libs/timidity/playmidi.cpp similarity index 100% rename from doomclassic/timidity/playmidi.cpp rename to neo/libs/timidity/playmidi.cpp diff --git a/doomclassic/timidity/playmidi.h b/neo/libs/timidity/playmidi.h similarity index 100% rename from doomclassic/timidity/playmidi.h rename to neo/libs/timidity/playmidi.h diff --git a/doomclassic/timidity/readmidi.cpp b/neo/libs/timidity/readmidi.cpp similarity index 99% rename from doomclassic/timidity/readmidi.cpp rename to neo/libs/timidity/readmidi.cpp index cec26a5a..7298f917 100644 --- a/doomclassic/timidity/readmidi.cpp +++ b/neo/libs/timidity/readmidi.cpp @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "../../neo/idlib/precompiled.h" +#include "../../idlib/precompiled.h" #include #include diff --git a/doomclassic/timidity/readmidi.h b/neo/libs/timidity/readmidi.h similarity index 100% rename from doomclassic/timidity/readmidi.h rename to neo/libs/timidity/readmidi.h diff --git a/doomclassic/timidity/resample.cpp b/neo/libs/timidity/resample.cpp similarity index 100% rename from doomclassic/timidity/resample.cpp rename to neo/libs/timidity/resample.cpp diff --git a/doomclassic/timidity/resample.h b/neo/libs/timidity/resample.h similarity index 100% rename from doomclassic/timidity/resample.h rename to neo/libs/timidity/resample.h diff --git a/doomclassic/timidity/sdl_a.cpp b/neo/libs/timidity/sdl_a.cpp similarity index 100% rename from doomclassic/timidity/sdl_a.cpp rename to neo/libs/timidity/sdl_a.cpp diff --git a/doomclassic/timidity/sdl_c.cpp b/neo/libs/timidity/sdl_c.cpp similarity index 98% rename from doomclassic/timidity/sdl_c.cpp rename to neo/libs/timidity/sdl_c.cpp index 08483024..ecc10de1 100644 --- a/doomclassic/timidity/sdl_c.cpp +++ b/neo/libs/timidity/sdl_c.cpp @@ -21,7 +21,7 @@ sdl_c.c Minimal control mode -- no interaction, just stores messages. */ -#include "../../neo/idlib/precompiled.h" +#include "../../idlib/precompiled.h" #include #include diff --git a/doomclassic/timidity/structs.h b/neo/libs/timidity/structs.h similarity index 100% rename from doomclassic/timidity/structs.h rename to neo/libs/timidity/structs.h diff --git a/doomclassic/timidity/tables.cpp b/neo/libs/timidity/tables.cpp similarity index 100% rename from doomclassic/timidity/tables.cpp rename to neo/libs/timidity/tables.cpp diff --git a/doomclassic/timidity/tables.h b/neo/libs/timidity/tables.h similarity index 100% rename from doomclassic/timidity/tables.h rename to neo/libs/timidity/tables.h diff --git a/doomclassic/timidity/timidity.cpp b/neo/libs/timidity/timidity.cpp similarity index 99% rename from doomclassic/timidity/timidity.cpp rename to neo/libs/timidity/timidity.cpp index cbf8ac53..89a79501 100644 --- a/doomclassic/timidity/timidity.cpp +++ b/neo/libs/timidity/timidity.cpp @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "../../neo/idlib/precompiled.h" +#include "../../idlib/precompiled.h" #include #include diff --git a/doomclassic/timidity/timidity.h b/neo/libs/timidity/timidity.h similarity index 100% rename from doomclassic/timidity/timidity.h rename to neo/libs/timidity/timidity.h