summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-12-18 11:25:31 -0500
committermidipix <writeonce@midipix.org>2016-12-18 11:52:23 -0500
commitff191a2b55e27f6342625f3806298eddb4a980df (patch)
tree26c92a2d3c66712c7aef633727614c507179a2ed
parentfd7fac250b72a66aa639bec1c15c833f643e9bee (diff)
downloadpemagine-ff191a2b55e27f6342625f3806298eddb4a980df.tar.bz2
pemagine-ff191a2b55e27f6342625f3806298eddb4a980df.tar.xz
project: clbuild-bat: added link target (shared-lib/default-app) support.
-rwxr-xr-xproject/clbuild.sh10
-rw-r--r--project/extras.mk3
2 files changed, 10 insertions, 3 deletions
diff --git a/project/clbuild.sh b/project/clbuild.sh
index 1e6a229..3af367f 100755
--- a/project/clbuild.sh
+++ b/project/clbuild.sh
@@ -13,6 +13,7 @@ mb_project_dir=
mb_sysroot=
version_header=
version_macro=
+link_target=
# one: args
for arg ; do
@@ -40,6 +41,9 @@ for arg ; do
--version-macro=*)
version_macro='-D'${arg#*=}'=\\\"unknown\\\"'
;;
+ --link-target=*)
+ link_target=${arg#*=}
+ ;;
*)
error_msg ${arg#}: "unsupported config argument."
exit 2
@@ -171,11 +175,13 @@ echo '@echo clbuild: successfully created: static archive.'
echo '@echo.'
echo
-# eight: link shared library
-make LDFLAGS_IMPLIB= LDFLAGS_SONAME= shared-lib \
+# eight: link
+make LDFLAGS_IMPLIB= LDFLAGS_SONAME= $link_target \
| grep -v 'make\[1\]:' \
+ | grep -v 'rm -f app\.tag' \
| sed \
-e 's@'"$mb_cc"' -shared @link /dll /nologo @' \
+ -e 's@'"$mb_cc"' @link /nologo @' \
-e 's@-o @/out:@g' \
-e 's@ -L@ /libpath:@g' \
-e 's,-static -l\([^ ]\+\), %sysroot%/lib/lib\1.a,g' \
diff --git a/project/extras.mk b/project/extras.mk
index 23a71c8..acf1b99 100644
--- a/project/extras.mk
+++ b/project/extras.mk
@@ -33,4 +33,5 @@ clbuild-bat:
--project-dir=$(PROJECT_DIR) \
--sysroot=$(CFLAGS_SYSROOT) \
--version-header=pemagine_version.h \
- --version-macro=PEMAGINE_GIT_VERSION
+ --version-macro=PEMAGINE_GIT_VERSION\
+ --link-target=shared-lib