Browse Source

Fix Windows build

Luke Dashjr 13 years ago
parent
commit
754586dc8e
3 changed files with 11 additions and 2 deletions
  1. 2 1
      Makefile.am
  2. 1 1
      libblkmaker
  3. 8 0
      make-release

+ 2 - 1
Makefile.am

@@ -32,7 +32,8 @@ bfgminer_SOURCES	+= elist.h miner.h compat.h bench_block.h	\
 if NEED_LIBBLKMAKER
 if NEED_LIBBLKMAKER
 SUBDIRS           += libblkmaker
 SUBDIRS           += libblkmaker
 bfgminer_CPPFLAGS += -Ilibblkmaker
 bfgminer_CPPFLAGS += -Ilibblkmaker
-bfgminer_LDFLAGS  += -Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs -lblkmaker-0.1 -lblkmaker_jansson-0.1
+bfgminer_LDFLAGS  += -Llibblkmaker/.libs -Wl,-rpath,libblkmaker/.libs
+bfgminer_LDADD    += -lblkmaker-0.1 -lblkmaker_jansson-0.1
 endif
 endif
 
 
 bfgminer_SOURCES	+= logging.c
 bfgminer_SOURCES	+= logging.c

+ 1 - 1
libblkmaker

@@ -1 +1 @@
-Subproject commit 20a7bacec22b475444a365d77035e6c07c972cef
+Subproject commit f52c225aaef6b0330ea0adf8d58094f17dc57ab7

+ 8 - 0
make-release

@@ -16,6 +16,8 @@ mkdir -v "$OUTDIR"
 cp -v \
 cp -v \
 	-L \
 	-L \
 	pdcurses.dll \
 	pdcurses.dll \
+	libblkmaker-0.1-0.dll \
+	libblkmaker_jansson-0.1-0.dll \
 	libcurl-4.dll \
 	libcurl-4.dll \
 	pthreadGC2.dll \
 	pthreadGC2.dll \
 	libjansson-4.dll \
 	libjansson-4.dll \
@@ -26,8 +28,14 @@ git branch TMP "$tag"
 git clone . "$TMPDIR" -b TMP --depth 1
 git clone . "$TMPDIR" -b TMP --depth 1
 git branch -D TMP
 git branch -D TMP
 cd "$TMPDIR"
 cd "$TMPDIR"
+git submodule update --init
 git archive --prefix "$sw"/ --format tar "$tag" | tar xvp
 git archive --prefix "$sw"/ --format tar "$tag" | tar xvp
+(
+	cd libblkmaker
+	git archive --prefix "libblkmaker/" --format tar HEAD | tar -C "../$sw" -xvp
+)
 cd "$sw"
 cd "$sw"
+NOSUBMODULES=1 \
 NOCONFIGURE=1 \
 NOCONFIGURE=1 \
 ./autogen.sh
 ./autogen.sh
 cd ..
 cd ..