mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-11-25 06:20:14 +00:00
Compare commits
2 Commits
c116794c83
...
7c66041a6f
Author | SHA1 | Date | |
---|---|---|---|
7c66041a6f | |||
2c822e210b |
6
Makefile
6
Makefile
@ -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
3
vendor/bcrypt/bcrypt.c
vendored
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user