diff --git a/make.sh b/make.sh index 350a1ad..008ed85 100755 --- a/make.sh +++ b/make.sh @@ -64,6 +64,7 @@ OUTPUT_DIRS="obj html" # none no special processing happens before each file # C #line directives are inserted before each file # and VERSION, VERMAJOR etc. are #defined +# Ch Like C, but for header files (no VERSION #defines) # make_monolithic() { if [ $# -ne 2 ] @@ -82,6 +83,9 @@ make_monolithic() { then HASHLINE=1 VERDEFINE=1 + elif [ "$2" == "Ch" ] + then + HASHLINE=1 elif [ "$2" == "none" ] then HASHLINE=0 # dummy command @@ -261,7 +265,7 @@ else targets="$@" fi -for func in "${targets}" +for func in ${targets} do case ${func} in clean) diff --git a/scripts/.gitignore b/scripts/.gitignore index ce33425..a540f48 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1,5 +1,6 @@ build.c++.app build.c++.lib +build.c++.qtapp build.c++.tests build.c.app build.c.lib diff --git a/src/libutf8++/build.lib b/src/libutf8++/build.lib index 484ee47..f206e6b 100644 --- a/src/libutf8++/build.lib +++ b/src/libutf8++/build.lib @@ -31,7 +31,7 @@ then echo " Compiling" SONAME="${libutf8pp_BASE}.so.${SOMAJOR}.${SOMINOR}" - do_cmd ${CXX} ${CFLAGS} -shared -fpic -o "${libutf8pp}" \ + do_cmd ${CXX} ${CFLAGS} -Iobj -shared -fpic -o "${libutf8pp}" \ -Wl,-soname,${SONAME} \ ${SRC} ${SO_EXTRA} || return 1 diff --git a/src/libutf8++/build.monolithic b/src/libutf8++/build.monolithic index d584710..d9fa1b4 100644 --- a/src/libutf8++/build.monolithic +++ b/src/libutf8++/build.monolithic @@ -9,7 +9,7 @@ MONOLITHIC_TESTS="src/libutf8++/build.lib src/libutf8++/build.monolithic" if [ -z "${libutf8pp_MONOLITHIC}" ] then MONOLITHIC_SOURCE="$(echo src/libutf8++/{TopHeader,ForwardDeclare,exception,string,{en,de}coder,BottomHeader}.h)" - make_monolithic ${HDR} C || return 1 + make_monolithic ${HDR} Ch || return 1 MONOLITHIC_SOURCE="$(echo src/libutf8++/{TopSource,exception,string,{en,de}coder}.cpp)" make_monolithic ${SRC} C || return 1 diff --git a/src/libutf8++/soversion b/src/libutf8++/soversion index edec6ee..b900c10 100644 --- a/src/libutf8++/soversion +++ b/src/libutf8++/soversion @@ -14,4 +14,4 @@ SOMAJOR=0 SOMINOR=0 # SOMICRO is bumped every time there is a binary-compatible release. -SOMICRO=0 +SOMICRO=1 diff --git a/version b/version index 14c1302..14eddd8 100644 --- a/version +++ b/version @@ -12,7 +12,7 @@ # suffixed with a string. VERMAJOR=1 VERMINOR=2 -VERMICRO=1 +VERMICRO=2 VEREXTRA="" # kate: replace-trailing-space-save true; space-indent true; tab-width 4;