Skip to content

Commit

Permalink
win32 and win64 binaries, from Debian's mingw
Browse files Browse the repository at this point in the history
$ acp mingw32 mingw32-binutils mingw32-runtime mingw-w64 mingw-w64-tools \
	| egrep '(^[a-z])|(\*\*\*)' \
	| sed -n 'N;s/\n//;s/\*\*\* //p'; \
	uname -a; \
	cat /etc/debian_version
mingw32: 4.2.1.dfsg-2 0
mingw32-binutils: 2.20-0.2 0
mingw32-runtime: 3.13-1 0
mingw-w64: 2.0.3-1 0
Linux deb 3.2.0-3-amd64 wg#1 SMP Thu Jun 28 09:07:26 UTC 2012 x86_64 GNU/Linux
wheezy/sid
  • Loading branch information
FauxFaux committed Aug 12, 2012
1 parent ed776a1 commit 887936d
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 0 deletions.
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@ ifeq ($(TARGET), darwin)
DYLIB := dylib
LDFLAGS := -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -Wl,-single_module
CFLAGS += -I $(JAVA_HOME)/Headers/
else ifeq ($(TARGET), win32)
DYLIB := dll
LDFLAGS := -shared
CC := i586-mingw32msvc-cc
SSE2 :=
CFLAGS += -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/$(TARGET) -DNO_HAVE_POSIX_MEMALIGN
else ifeq ($(TARGET), win64)
DYLIB := dll
LDFLAGS := -shared
CC := i686-w64-mingw32-gcc
SSE2 :=
CFLAGS += -fPIC -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/$(TARGET) -DNO_HAVE_POSIX_MEMALIGN
else
DYLIB := so
LDFLAGS := -shared
Expand Down
3 changes: 3 additions & 0 deletions src/main/c/crypto_scrypt-nosse.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@
#include "scrypt_platform.h"

#include <sys/types.h>

#ifdef HAVE_POSIX_MEMALIGN
#include <sys/mman.h>
#endif

#include <errno.h>
#include <stdint.h>
Expand Down
2 changes: 2 additions & 0 deletions src/main/include/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
#define HAVE_MMAP 1

#ifndef __ANDROID__
#ifndef NO_HAVE_POSIX_MEMALIGN
#define HAVE_POSIX_MEMALIGN 1
#endif
#endif

#ifdef __ANDROID__
#include <sys/limits.h>
Expand Down
Binary file added src/main/resources/lib/x86/windows/libscrypt.dll
Binary file not shown.
Binary file not shown.

0 comments on commit 887936d

Please sign in to comment.