winsock
This commit is contained in:
parent
fa154b8662
commit
e9b4f88a5c
3 changed files with 19 additions and 9 deletions
|
|
@ -51,7 +51,6 @@ static void render(GSEngine self){
|
|||
{20, -1, -20},
|
||||
{20, -1, 20}
|
||||
};
|
||||
GSVector3 pos = {0, 0, 0};
|
||||
GSVector3 n = {0, 1, 0};
|
||||
|
||||
for(i = 0; i < sizeof(obj) / sizeof(obj[0]); i++){
|
||||
|
|
@ -64,15 +63,10 @@ static void render(GSEngine self){
|
|||
GSGLPushMatrix(gl);
|
||||
GSGLSetPosition(gl, rv);
|
||||
GSGLSetRotation3x3(gl, rm);
|
||||
//GSGLTetrakis(gl, 0.5, col1, col2);
|
||||
GSGLTetrakis(gl, 0.5, col1, col2);
|
||||
GSGLPopMatrix(gl);
|
||||
}
|
||||
|
||||
GSGLPushMatrix(gl);
|
||||
GSGLSetPosition(gl, pos);
|
||||
GSGLTetrakis(gl, 0.5, col1, col2);
|
||||
GSGLPopMatrix(gl);
|
||||
|
||||
GSGLSetColor(gl, col2);
|
||||
GSGLPolygon(gl, 4, v, NULL, n);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ target_compile_definitions(GearSrc PRIVATE _GEARSRC)
|
|||
target_link_libraries(GearSrc PRIVATE ode lz4)
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
target_link_options(GearSrc PRIVATE -static-libgcc -static-libstdc++)
|
||||
target_link_libraries(GearSrc PRIVATE ws2_32)
|
||||
else()
|
||||
target_link_libraries(GearSrc PRIVATE stdc++)
|
||||
target_link_libraries(GearSrc PRIVATE m pthread)
|
||||
target_link_libraries(GearSrc PRIVATE stdc++ m pthread)
|
||||
endif()
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||
target_link_libraries(GearSrc PRIVATE dl)
|
||||
|
|
|
|||
|
|
@ -9,11 +9,27 @@
|
|||
#include <GearSrc/Net.h>
|
||||
#include <GearSrc/Physics.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include <winsock.h>
|
||||
#endif
|
||||
|
||||
#include <stb_ds.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
static void init_winsock(void){
|
||||
WSADATA wsa;
|
||||
|
||||
WSAStartup(MAKEWORD(1, 1), &wsa);
|
||||
}
|
||||
#endif
|
||||
|
||||
void GSInit(void) {
|
||||
GSVersion version;
|
||||
|
||||
#ifdef _WIN32
|
||||
init_winsock();
|
||||
#endif
|
||||
|
||||
GSVersionGet(&version);
|
||||
|
||||
GSLog(NULL, GSLogInfo, "GearSrc Engine %s", version.string);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue