pyrite-dev/assaultfish
13
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove xemil

Browse source
This commit is contained in:
Nishi 2026-01-12 09:12:19 +09:00
commit 37af5146fc
Signed by: nishi
GPG key ID: 27EF69B208EB9343
8 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -4,6 +4,3 @@
[submodule "submodule/ode"] [submodule "submodule/ode"]
path = submodule/ode path = submodule/ode
url = https://github.com/thomasmarsh/ODE url = https://github.com/thomasmarsh/ODE
[submodule "submodule/xemil"]
path = submodule/xemil
url = ../xemil

1
CMakeLists.txt
View file

@ -12,7 +12,6 @@ set(MW_INSTALL_HEADERS OFF)
add_subdirectory(external/lz4) add_subdirectory(external/lz4)
add_subdirectory(external/ode) add_subdirectory(external/ode)
add_subdirectory(submodule/milsko) # Since Milsko provides CMake, we just use it add_subdirectory(submodule/milsko) # Since Milsko provides CMake, we just use it
add_subdirectory(external/xemil)
add_subdirectory(engine) add_subdirectory(engine)

2
engine/CMakeLists.txt
View file

@ -19,7 +19,7 @@ file(GLOB GearSrc_SRC src/*.c)
add_library(GearSrc SHARED ${GearSrc_SRC}) add_library(GearSrc SHARED ${GearSrc_SRC})
target_include_directories(GearSrc PUBLIC include) target_include_directories(GearSrc PUBLIC include)
target_compile_definitions(GearSrc PRIVATE _GEARSRC) 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++) target_link_options(GearSrc PRIVATE -static-libgcc -static-libstdc++)
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows") if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
target_link_libraries(GearSrc PRIVATE m) target_link_libraries(GearSrc PRIVATE m)

4
engine/include/GearSrc/MachDep.h
View file

@ -7,10 +7,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <math.h> #include <math.h>
#ifdef _GEARSRC
#include <xemil.h>
#endif
#if defined(_GEARSRC) && defined(_WIN32) #if defined(_GEARSRC) && defined(_WIN32)
#define GSDECL extern __declspec(dllexport) #define GSDECL extern __declspec(dllexport)
#elif defined(_WIN32) #elif defined(_WIN32)

2
engine/include/GearSrc/TypeDefs.h
View file

@ -48,7 +48,6 @@ typedef struct _GSFile* GSFile;
typedef struct _GSResource* GSResource; typedef struct _GSResource* GSResource;
typedef struct _GSGL* GSGL; typedef struct _GSGL* GSGL;
typedef struct _GSSkyBox* GSSkyBox; typedef struct _GSSkyBox* GSSkyBox;
typedef xemil_t* GSXML;
#else #else
typedef void* GSClient; typedef void* GSClient;
typedef void* GSServer; typedef void* GSServer;
@ -57,7 +56,6 @@ typedef void* GSFile;
typedef void* GSResource; typedef void* GSResource;
typedef void* GSGL; typedef void* GSGL;
typedef void* GSSkyBox; typedef void* GSSkyBox;
typedef void* GSXML;
#endif #endif
typedef float GSNumber; typedef float GSNumber;
typedef GSNumber GSVector2[2]; typedef GSNumber GSVector2[2];

9
external/xemil/CMakeLists.txt vendored
View file

@ -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)

1
submodule/xemil

@ -1 +0,0 @@
Subproject commit 280b00720e86ea84a73023528151320ee767b1cd