Merge branch 'release' into ceammc

uliss · Feb 28, 2019 · 63d9123 · 63d9123
2 parents d758350 + 3ac6747
commit 63d9123
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/ceammc/distrib/CMakeLists.txt b/ceammc/distrib/CMakeLists.txt
@@ -34,12 +34,19 @@ if(MAKELIB_SCRIPT)
                 "${CEAMMC_LIB_VERSION}"
             SOURCES mac/make_lib_mac.sh)
     elseif(WIN32)
+        if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+            set(CEAMMC_DISTRIB_ARCH "64-bit")
+        elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+            set(CEAMMC_DISTRIB_ARCH "32-bit")
+        endif()
+
         add_custom_target(ceammc_lib
             COMMAND "${MAKELIB_SCRIPT}"
                 "${CMAKE_SOURCE_DIR}/ceammc"
                 "${CMAKE_INSTALL_PREFIX}"
                 "${CMAKE_BINARY_DIR}/dist"
                 "${CEAMMC_LIB_VERSION}"
+                "${CEAMMC_DISTRIB_ARCH}"
             SOURCES win/make_lib_win.sh)
     endif()
 endif()

diff --git a/ceammc/distrib/win/CMakeLists.txt b/ceammc/distrib/win/CMakeLists.txt
@@ -6,9 +6,9 @@ endif()
 
 if(WIN32)
     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(CEAMMC_DISTRIB_ARCH "(64-bit)")
+        set(CEAMMC_DISTRIB_ARCH "64-bit")
     elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-        set(CEAMMC_DISTRIB_ARCH "(32-bit)")
+        set(CEAMMC_DISTRIB_ARCH "32-bit")
     endif()
 endif()
 

diff --git a/ceammc/distrib/win/make_lib_win.sh b/ceammc/distrib/win/make_lib_win.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
 
-if [ $# -ne 4 ]
+if [ $# -ne 5 ]
 then
-    echo "Usage: $0 SRCDIR BINDIR OUTDIR VERSION"
+    echo "Usage: $0 SRCDIR BINDIR OUTDIR VERSION ARCH"
     exit 1
 fi
 
 SRCDIR="$1"
 BINDIR="$2"
 VERSION="$4"
 OUTDIR="$3/ceammc"
-OUTFILE="ceammc-${VERSION}-win-pd-0.47.zip"
+ARCH="$5"
+OUTFILE="ceammc-${VERSION}-win-pd-0.47-${ARCH}.zip"
 
 echo "    - source dir:  ${SRCDIR}"
 echo "    - binary dir:  ${BINDIR}"
@@ -47,7 +48,7 @@ do
     echo "+ Dll:  $(basename $file)"
 done
 
-rm -f "${OUTDIR}/debug.gensym.dll" 
+rm -f "${OUTDIR}/debug.gensym.dll"
 
 echo "Copying TCL files to ${OUTDIR} ..."
 find "${SRCDIR}/extra/hcs" -name *\\.tcl | while read file