Relintai/sfw
1
0
Fork 0
mirror of https://github.com/Relintai/sfw.git synced 2025-04-14 09:10:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Work on the amalgamated windows build.

Browse Source
This commit is contained in:
Relintai 2024-01-19 11:05:13 +01:00
parent 13de8ffeae
commit c421ae5f04
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sfw/core/aabb.cpp
View File

@ -114,6 +114,10 @@ AABB AABB::intersection(const AABB &p_aabb) const {
return AABB(min, max - min); return AABB(min, max - min);
} }
// MSVC
#undef near
#undef far
bool AABB::intersects_ray(const Vector3 &p_from, const Vector3 &p_dir, Vector3 *r_clip, Vector3 *r_normal) const { bool AABB::intersects_ray(const Vector3 &p_from, const Vector3 &p_dir, Vector3 *r_clip, Vector3 *r_normal) const {
Vector3 c1, c2; Vector3 c1, c2;
Vector3 end = position + size; Vector3 end = position + size;

13
sfw/core/inet_address.cpp
View File

@ -41,9 +41,22 @@ WINSOCK_API_LINKAGE PCSTR WSAAPI inet_ntop(INT Family, VOID * pAddr, PSTR pStrin
} }
#else #else
// Windows... // Windows...
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <in6addr.h> #include <in6addr.h>
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
extern "C" {
PCSTR WSAAPI inet_ntop( _In_ INT Family,_In_ const VOID * pAddr,_Out_writes_(StringBufSize) PSTR pStringBuf, _In_ size_t StringBufSize);
WINSOCK_API_LINKAGE INT WSAAPI inet_pton(_In_ INT Family,_In_ PCSTR pszAddrString, _When_(Family == AF_INET, _Out_writes_bytes_(sizeof(IN_ADDR)))_When_(Family == AF_INET6, _Out_writes_bytes_(sizeof(IN6_ADDR)))PVOID pAddrBuf);
}
#endif #endif
struct in6__addruint { struct in6__addruint {

4
tools/merger/sfw_full.h.inl
View File

@ -816,7 +816,9 @@
#ifdef GLAD_API_CALL #ifdef GLAD_API_CALL
#undef GLAD_API_CALL #undef GLAD_API_CALL
#endif #endif
#define GLAD_API_CALL extern API ///- #define GLAD_API_CALL extern
//TODO Figure out why did this build, and why it now doesn't want to work in the amalgamated build
// API ///-
#endif #endif
#ifndef GLAD_GL_H_ #ifndef GLAD_GL_H_