Browse Source

Merge pull request #399 from TimothyGu/upstr

Build import libs as .dll.a instead of .lib
tags/v0.2.10.rc1^2
Zhang Xianyi 12 years ago
parent
commit
b82108f899
3 changed files with 6 additions and 2 deletions
  1. +4
    -0
      .gitignore
  2. +1
    -1
      Makefile.install
  3. +1
    -1
      exports/Makefile

+ 4
- 0
.gitignore View File

@@ -21,8 +21,10 @@ lapack-netlib/TESTING/testing_results.txt
lib.grd
nohup.out
config.h
config_kernel.h
Makefile.conf
Makefile.conf_last
Makefile_kernel.conf
config_last.h
getarch
getarch_2nd
@@ -41,6 +43,8 @@ ctest/xzcblat2
ctest/xzcblat3
exports/linktest.c
exports/linux.def
kernel/setparam_*.c
kernel/kernel_*.h
test/CBLAT2.SUMM
test/CBLAT3.SUMM
test/DBLAT2.SUMM


+ 1
- 1
Makefile.install View File

@@ -83,7 +83,7 @@ ifeq ($(OSNAME), Darwin)
endif
ifeq ($(OSNAME), WINNT)
@-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR)
@-cp $(LIBPREFIX).lib $(OPENBLAS_LIBRARY_DIR)
@-cp $(LIBDLLNAME).a $(OPENBLAS_LIBRARY_DIR)
endif
ifeq ($(OSNAME), CYGWIN_NT)
@-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR)


+ 1
- 1
exports/Makefile View File

@@ -84,7 +84,7 @@ dll : ../$(LIBDLLNAME)
../$(LIBDLLNAME) : ../$(LIBNAME) libopenblas.def dllinit.$(SUFFIX)
$(RANLIB) ../$(LIBNAME)
$(CC) $(CFLAGS) $(LDFLAGS) libopenblas.def dllinit.$(SUFFIX) \
-shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(LIBPREFIX).lib \
-shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(LIBDLLNAME).a \
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) $(EXTRALIB)

libopenblas.def : gensymbol


Loading…
Cancel
Save