remove xemil
This commit is contained in:
parent
6e7ba8658b
commit
37af5146fc
8 changed files with 5 additions and 25 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -4,6 +4,3 @@
|
|||
[submodule "submodule/ode"]
|
||||
path = submodule/ode
|
||||
url = https://github.com/thomasmarsh/ODE
|
||||
[submodule "submodule/xemil"]
|
||||
path = submodule/xemil
|
||||
url = ../xemil
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -7,10 +7,6 @@
|
|||
#include <stdarg.h>
|
||||
#include <math.h>
|
||||
|
||||
#ifdef _GEARSRC
|
||||
#include <xemil.h>
|
||||
#endif
|
||||
|
||||
#if defined(_GEARSRC) && defined(_WIN32)
|
||||
#define GSDECL extern __declspec(dllexport)
|
||||
#elif defined(_WIN32)
|
||||
|
|
|
|||
|
|
@ -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];
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
9
external/xemil/CMakeLists.txt
vendored
9
external/xemil/CMakeLists.txt
vendored
|
|
@ -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 +0,0 @@
|
|||
Subproject commit 280b00720e86ea84a73023528151320ee767b1cd
|
||||
Loading…
Add table
Add a link
Reference in a new issue