diff --git a/.gitmodules b/.gitmodules index a524534..e4ba078 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "submodule/ode"] path = submodule/ode url = https://github.com/thomasmarsh/ODE -[submodule "submodule/xemil"] - path = submodule/xemil - url = ../xemil diff --git a/CMakeLists.txt b/CMakeLists.txt index b8304b4..5d7bbe9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,6 @@ set(MW_INSTALL_HEADERS OFF) add_subdirectory(external/lz4) add_subdirectory(external/ode) add_subdirectory(submodule/milsko) # Since Milsko provides CMake, we just use it -add_subdirectory(external/xemil) add_subdirectory(engine) diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index 66d9ff3..9a6773e 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -19,7 +19,7 @@ file(GLOB GearSrc_SRC src/*.c) add_library(GearSrc SHARED ${GearSrc_SRC}) target_include_directories(GearSrc PUBLIC include) target_compile_definitions(GearSrc PRIVATE _GEARSRC) -target_link_libraries(GearSrc PRIVATE xemil ode lz4) +target_link_libraries(GearSrc PRIVATE ode lz4) target_link_options(GearSrc PRIVATE -static-libgcc -static-libstdc++) if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") target_link_libraries(GearSrc PRIVATE m) diff --git a/engine/include/GearSrc/MachDep.h b/engine/include/GearSrc/MachDep.h index f016600..1d14942 100644 --- a/engine/include/GearSrc/MachDep.h +++ b/engine/include/GearSrc/MachDep.h @@ -7,10 +7,6 @@ #include #include -#ifdef _GEARSRC -#include -#endif - #if defined(_GEARSRC) && defined(_WIN32) #define GSDECL extern __declspec(dllexport) #elif defined(_WIN32) diff --git a/engine/include/GearSrc/TypeDefs.h b/engine/include/GearSrc/TypeDefs.h index 990d015..247bd92 100644 --- a/engine/include/GearSrc/TypeDefs.h +++ b/engine/include/GearSrc/TypeDefs.h @@ -48,7 +48,6 @@ typedef struct _GSFile* GSFile; typedef struct _GSResource* GSResource; typedef struct _GSGL* GSGL; typedef struct _GSSkyBox* GSSkyBox; -typedef xemil_t* GSXML; #else typedef void* GSClient; typedef void* GSServer; @@ -57,7 +56,6 @@ typedef void* GSFile; typedef void* GSResource; typedef void* GSGL; typedef void* GSSkyBox; -typedef void* GSXML; #endif typedef float GSNumber; typedef GSNumber GSVector2[2]; diff --git a/engine/src/skybox.c b/engine/src/skybox.c index d713baa..fa4e3dd 100644 --- a/engine/src/skybox.c +++ b/engine/src/skybox.c @@ -39,12 +39,12 @@ GSSkyBox GSSkyBoxOpen(GSClient client, const char* base) { return skybox; } -GSSkyBox GSSkyBoxTry(GSClient client, const char* name){ +GSSkyBox GSSkyBoxTry(GSClient client, const char* name) { const char* ns[] = {"game", "base"}; - int i; - GSSkyBox sb = NULL; + int i; + GSSkyBox sb = NULL; - for(i = 0; i < 2; i++){ + for(i = 0; i < 2; i++) { char* b = GSStringConcat(ns[i], ":/skybox/"); char* s = GSStringConcat(b, name); diff --git a/external/xemil/CMakeLists.txt b/external/xemil/CMakeLists.txt deleted file mode 100644 index afcb4be..0000000 --- a/external/xemil/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -cmake_minimum_required(VERSION 3.11) -project(xemil) - -file(GLOB XEMIL_SRC ../../submodule/xemil/src/*.c) - -add_library(xemil ${XEMIL_SRC}) -target_include_directories(xemil PUBLIC ../../submodule/xemil/include) - -set_property(TARGET xemil PROPERTY POSITION_INDEPENDENT_CODE ON) diff --git a/submodule/xemil b/submodule/xemil deleted file mode 160000 index 280b007..0000000 --- a/submodule/xemil +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 280b00720e86ea84a73023528151320ee767b1cd