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

winsock

Browse source
This commit is contained in:
Nishi 2026-02-01 22:34:10 +09:00
commit e9b4f88a5c
Signed by: nishi
GPG key ID: 27EF69B208EB9343
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/main.c
View file

@ -51,7 +51,6 @@ static void render(GSEngine self){
{20, -1, -20}, {20, -1, -20},
{20, -1, 20} {20, -1, 20}
}; };
GSVector3 pos = {0, 0, 0};
GSVector3 n = {0, 1, 0}; GSVector3 n = {0, 1, 0};
for(i = 0; i < sizeof(obj) / sizeof(obj[0]); i++){ for(i = 0; i < sizeof(obj) / sizeof(obj[0]); i++){
@ -64,15 +63,10 @@ static void render(GSEngine self){
GSGLPushMatrix(gl); GSGLPushMatrix(gl);
GSGLSetPosition(gl, rv); GSGLSetPosition(gl, rv);
GSGLSetRotation3x3(gl, rm); GSGLSetRotation3x3(gl, rm);
//GSGLTetrakis(gl, 0.5, col1, col2); GSGLTetrakis(gl, 0.5, col1, col2);
GSGLPopMatrix(gl); GSGLPopMatrix(gl);
} }
GSGLPushMatrix(gl);
GSGLSetPosition(gl, pos);
GSGLTetrakis(gl, 0.5, col1, col2);
GSGLPopMatrix(gl);
GSGLSetColor(gl, col2); GSGLSetColor(gl, col2);
GSGLPolygon(gl, 4, v, NULL, n); GSGLPolygon(gl, 4, v, NULL, n);
} }

4
engine/CMakeLists.txt
View file

@ -30,9 +30,9 @@ target_compile_definitions(GearSrc PRIVATE _GEARSRC)
target_link_libraries(GearSrc PRIVATE ode lz4) target_link_libraries(GearSrc PRIVATE ode lz4)
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
target_link_options(GearSrc PRIVATE -static-libgcc -static-libstdc++) target_link_options(GearSrc PRIVATE -static-libgcc -static-libstdc++)
target_link_libraries(GearSrc PRIVATE ws2_32)
else() else()
target_link_libraries(GearSrc PRIVATE stdc++) target_link_libraries(GearSrc PRIVATE stdc++ m pthread)
target_link_libraries(GearSrc PRIVATE m pthread)
endif() endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
target_link_libraries(GearSrc PRIVATE dl) target_link_libraries(GearSrc PRIVATE dl)

16
engine/src/core.c
View file

@ -9,11 +9,27 @@
#include <GearSrc/Net.h> #include <GearSrc/Net.h>
#include <GearSrc/Physics.h> #include <GearSrc/Physics.h>
#ifdef _WIN32
#include <winsock.h>
#endif
#include <stb_ds.h> #include <stb_ds.h>
#ifdef _WIN32
static void init_winsock(void){
WSADATA wsa;
WSAStartup(MAKEWORD(1, 1), &wsa);
}
#endif
void GSInit(void) { void GSInit(void) {
GSVersion version; GSVersion version;
#ifdef _WIN32
init_winsock();
#endif
GSVersionGet(&version); GSVersionGet(&version);
GSLog(NULL, GSLogInfo, "GearSrc Engine %s", version.string); GSLog(NULL, GSLogInfo, "GearSrc Engine %s", version.string);