mirror of
https://github.com/VCMP-SqMod/SqMod.git
synced 2025-10-24 20:07:19 +02:00
Update libraries and make it build on windows.
Still gets some warnings because compilers have changed. But should work.
This commit is contained in:
4
vendor/POCO/release/script/cpproj
vendored
4
vendor/POCO/release/script/cpproj
vendored
@@ -51,6 +51,10 @@ if [ -d ${src}/cmake ] ; then
|
||||
cp -R ${src}/cmake/* ${dst}/cmake >/dev/null 2>&1
|
||||
fi
|
||||
|
||||
if [ -f ${src}/vcpkg.json ] ; then
|
||||
cp ${src}/vcpkg*.json ${dst}
|
||||
fi
|
||||
|
||||
if [ -d ${src}/testsuite ] ; then
|
||||
mkdir -p ${dst}/testsuite
|
||||
mkdir -p ${dst}/testsuite/src
|
||||
|
||||
2
vendor/POCO/release/script/mkdoc
vendored
2
vendor/POCO/release/script/mkdoc
vendored
@@ -86,7 +86,7 @@ echo "Building tools"
|
||||
tools=$POCO_BASE/stage/tools
|
||||
rm -rf $tools
|
||||
mkdir -p $tools
|
||||
mkrelease -o $tools $version CppParser PocoDoc
|
||||
mkrelease -o $tools $version Data Data/SQLite CppParser PocoDoc
|
||||
|
||||
cd $tools
|
||||
./configure --no-tests --no-samples --no-prefix
|
||||
|
||||
2
vendor/POCO/release/script/mkdocumentation
vendored
2
vendor/POCO/release/script/mkdocumentation
vendored
@@ -123,7 +123,7 @@ done
|
||||
|
||||
: ${CC:=gcc}
|
||||
: ${CXX:=g++}
|
||||
: ${CXXFLAGS:=-std=c++11}
|
||||
: ${CXXFLAGS:=-std=c++17}
|
||||
|
||||
echo "CC=$CC" >>$build/PocoDoc.ini
|
||||
echo "CXX=$CXX" >>$build/PocoDoc.ini
|
||||
|
||||
40
vendor/POCO/release/script/mkrelease
vendored
40
vendor/POCO/release/script/mkrelease
vendored
@@ -85,7 +85,6 @@ mkdir -p ${target}/cmake
|
||||
#
|
||||
echo ${version} "(`date +%Y-%m-%d`)" >${target}/VERSION
|
||||
cp ${POCO_BASE}/LICENSE ${target}
|
||||
cp ${POCO_BASE}/NEWS ${target}
|
||||
cp ${POCO_BASE}/README ${target}
|
||||
cp ${POCO_BASE}/CHANGELOG ${target}
|
||||
cp ${POCO_BASE}/CONTRIBUTORS ${target}
|
||||
@@ -112,6 +111,7 @@ cp ${POCO_BASE}/build/config/* ${target}/build/config
|
||||
cp ${POCO_BASE}/build/rules/* ${target}/build/rules
|
||||
cp ${POCO_BASE}/build/script/* ${target}/build/script
|
||||
cp ${POCO_BASE}/buildwin.cmd ${target}
|
||||
cp ${POCO_BASE}/buildwin.ps1 ${target}
|
||||
cp ${POCO_BASE}/configure ${target}
|
||||
cp ${POCO_BASE}/libversion ${target}
|
||||
|
||||
@@ -164,6 +164,13 @@ done
|
||||
chmod -R +w ${target}
|
||||
|
||||
|
||||
#
|
||||
# Remove VS90 and progen
|
||||
#
|
||||
find ${target} -name '*.progen' -exec rm {} \;
|
||||
find ${target} -iname '*_vs90.sln' -exec rm {} \;
|
||||
|
||||
|
||||
#
|
||||
# Generate Makefile
|
||||
#
|
||||
@@ -341,9 +348,18 @@ ${comp}-libexec: $dependencies
|
||||
ENDOFSCRIPT
|
||||
|
||||
if [ -d "${POCO_BASE}/${comp}/testsuite" ] ; then
|
||||
tdependencies=""
|
||||
if [ -f "${POCO_BASE}/${comp}/testsuite/dependencies" ] ; then
|
||||
for dep in `cat "${POCO_BASE}/${comp}/testsuite/dependencies"` ;
|
||||
do
|
||||
# get rid of surrounding whitespace (trailing \r on Cygwin)
|
||||
read dep <<< ${dep}
|
||||
tdependencies="$tdependencies ${dep}-libexec"
|
||||
done
|
||||
fi
|
||||
cat >>${target}/Makefile <<ENDOFSCRIPT
|
||||
|
||||
${comp}-tests: ${comp}-libexec cppunit
|
||||
${comp}-tests: ${comp}-libexec $tdependencies cppunit
|
||||
\$(MAKE) -C \$(POCO_BASE)/${comp}/testsuite
|
||||
ENDOFSCRIPT
|
||||
fi
|
||||
@@ -396,24 +412,6 @@ distclean:
|
||||
ENDOFSCRIPT
|
||||
|
||||
|
||||
#
|
||||
# Create Visual Studio 14 build script
|
||||
#
|
||||
cat >${target}/build_vs140.cmd <<'ENDOFSCRIPT'
|
||||
@echo off
|
||||
buildwin 140 build shared both Win32 samples
|
||||
ENDOFSCRIPT
|
||||
|
||||
|
||||
#
|
||||
# Create Visual Studio 15 build script
|
||||
#
|
||||
cat >${target}/build_vs150.cmd <<'ENDOFSCRIPT'
|
||||
@echo off
|
||||
buildwin 150 build shared both Win32 samples
|
||||
ENDOFSCRIPT
|
||||
|
||||
|
||||
#
|
||||
# Create Visual Studio 16 build script
|
||||
#
|
||||
@@ -436,8 +434,6 @@ ENDOFSCRIPT
|
||||
# Fix line endings
|
||||
#
|
||||
if [ "$lineEndConv" != "" ] ; then
|
||||
$lineEndConv ${target}/build_vs140.cmd
|
||||
$lineEndConv ${target}/build_vs150.cmd
|
||||
$lineEndConv ${target}/build_vs160.cmd
|
||||
$lineEndConv ${target}/build_vs170.cmd
|
||||
$lineEndConv ${target}/Makefile
|
||||
|
||||
1
vendor/POCO/release/spec/all.release
vendored
1
vendor/POCO/release/spec/all.release
vendored
@@ -6,6 +6,7 @@ Data/SQLite
|
||||
Data/ODBC
|
||||
Data/MySQL
|
||||
Data/PostgreSQL
|
||||
Data/DataTest
|
||||
Zip
|
||||
PageCompiler
|
||||
PageCompiler/File2Page
|
||||
|
||||
Reference in New Issue
Block a user