OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 05:20:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: OpenPunk:dd62273273f9f10ca1f964cc7f324c4b03a08ee3
Branches Tags
OpenPunk:master
OpenPunk:landlock
OpenPunk:lua-more-better
OpenPunk:refactor
OpenPunk:win32-x86
OpenPunk:patchmap
OpenPunk:lua
OpenPunk:1.6
OpenPunk:1.5.2
OpenPunk:1.5.1
OpenPunk:1.5
OpenPunk:1.4
OpenPunk:1.3
OpenPunk:1.2.1
OpenPunk:1.2
OpenPunk:1.1
OpenPunk:1.0
..
compare: OpenPunk:1f5ac83c03339f6803ed1074b75c169ae242a4d8
Branches Tags
OpenPunk:master
OpenPunk:landlock
OpenPunk:lua-more-better
OpenPunk:refactor
OpenPunk:win32-x86
OpenPunk:patchmap
OpenPunk:lua
OpenPunk:1.6
OpenPunk:1.5.2
OpenPunk:1.5.1
OpenPunk:1.5
OpenPunk:1.4
OpenPunk:1.3
OpenPunk:1.2.1
OpenPunk:1.2
OpenPunk:1.1
OpenPunk:1.0

3 Commits
dd62273273 ... 1f5ac83c03

Author SHA1 Message Date
cpunk
1f5ac83c03
Merge 37386b857a into 7c66041a6f 2024-10-12 16:53:08 +02:00
dongresource
7c66041a6f Add make target for building without the sandbox 2024-10-12 15:42:26 +02:00
dongresource
2c822e210b [bcrypt] Fix missing include on Windows 
Co-authored-by: Jade Shrinemaiden <jadeshrinemaiden@gmail.com>
 2024-10-12 15:15:36 +02:00
2 changed files with 7 additions and 2 deletions
Show Stats Expand all files Collapse all files

6
Makefile
View File

@ -134,6 +134,8 @@ all: $(SERVER)
windows: $(SERVER) windows: $(SERVER)
nosandbox: $(SERVER)
# assign Windows-specific values if targeting Windows # assign Windows-specific values if targeting Windows
windows : CC=$(WIN_CC) windows : CC=$(WIN_CC)
windows : CXX=$(WIN_CXX) windows : CXX=$(WIN_CXX)
@ -142,6 +144,8 @@ windows : CXXFLAGS=$(WIN_CXXFLAGS)
windows : LDFLAGS=$(WIN_LDFLAGS) windows : LDFLAGS=$(WIN_LDFLAGS)
windows : SERVER=$(WIN_SERVER) windows : SERVER=$(WIN_SERVER)
nosandbox : CFLAGS+=-DCONFIG_NOSANDBOX=1
.SUFFIXES: .o .c .cpp .h .hpp .SUFFIXES: .o .c .cpp .h .hpp
.c.o: .c.o:
@ -163,7 +167,7 @@ version.h:
src/main.o: version.h src/main.o: version.h
.PHONY: all windows clean nuke .PHONY: all windows nosandbox clean nuke
# only gets rid of OpenFusion objects, so we don't need to # only gets rid of OpenFusion objects, so we don't need to
# recompile the libs every time # recompile the libs every time

3
vendor/bcrypt/bcrypt.c vendored
View File

@ -38,9 +38,10 @@ typedef __int64 ssize_t;
#include <wincrypt.h> /* CryptAcquireContext, CryptGenRandom */ #include <wincrypt.h> /* CryptAcquireContext, CryptGenRandom */
#else #else
#include "bcrypt.h" #include "bcrypt.h"
#include "ow-crypt.h"
#endif #endif
#include "ow-crypt.h"
#define RANDBYTES (16) #define RANDBYTES (16)
static int try_close(int fd) static int try_close(int fd)