mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2024-11-22 13:30:06 +00:00
Compare commits
No commits in common. "7c66041a6f7d5e83a4f3a8d8570613e5b2f8d47b" and "c116794c830c38bf057cdcfbb1d5ade6f1a5718e" have entirely different histories.
7c66041a6f
...
c116794c83
6
Makefile
6
Makefile
@ -134,8 +134,6 @@ all: $(SERVER)
|
||||
|
||||
windows: $(SERVER)
|
||||
|
||||
nosandbox: $(SERVER)
|
||||
|
||||
# assign Windows-specific values if targeting Windows
|
||||
windows : CC=$(WIN_CC)
|
||||
windows : CXX=$(WIN_CXX)
|
||||
@ -144,8 +142,6 @@ windows : CXXFLAGS=$(WIN_CXXFLAGS)
|
||||
windows : LDFLAGS=$(WIN_LDFLAGS)
|
||||
windows : SERVER=$(WIN_SERVER)
|
||||
|
||||
nosandbox : CFLAGS+=-DCONFIG_NOSANDBOX=1
|
||||
|
||||
.SUFFIXES: .o .c .cpp .h .hpp
|
||||
|
||||
.c.o:
|
||||
@ -167,7 +163,7 @@ version.h:
|
||||
|
||||
src/main.o: version.h
|
||||
|
||||
.PHONY: all windows nosandbox clean nuke
|
||||
.PHONY: all windows clean nuke
|
||||
|
||||
# only gets rid of OpenFusion objects, so we don't need to
|
||||
# recompile the libs every time
|
||||
|
3
vendor/bcrypt/bcrypt.c
vendored
3
vendor/bcrypt/bcrypt.c
vendored
@ -38,9 +38,8 @@ typedef __int64 ssize_t;
|
||||
#include <wincrypt.h> /* CryptAcquireContext, CryptGenRandom */
|
||||
#else
|
||||
#include "bcrypt.h"
|
||||
#endif
|
||||
|
||||
#include "ow-crypt.h"
|
||||
#endif
|
||||
|
||||
#define RANDBYTES (16)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user