From 36fda20a6f4dffb34fdb0ac1aa85d1478dfe8ca9 Mon Sep 17 00:00:00 2001 From: Alexander Zhirov Date: Tue, 9 May 2023 23:17:26 +0300 Subject: [PATCH] fix build --- README.md | 6 +++++- build.sh | 31 ++++++++++++++++--------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 4789a06..b8763a9 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,10 @@ make ### Сборка одним скриптом +Где ``: +- `Linux515_64` +- `Linux62_64` + ```sh -./build.sh +./build.sh ``` diff --git a/build.sh b/build.sh index 4f02eec..b7f16da 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,7 @@ #!/bin/sh CURRENT_PATH=$PWD +LINUX_VERSION=$1 export USE_GTK3=Yes export USE_PKGCONFIG=Yes @@ -8,21 +9,21 @@ export USE_LUA_VERSION=54 export USE_LUA54=Yes export LUA_LIB=$CURRENT_PATH/lua-5.4.4/src export LUA_INC=$CURRENT_PATH/lua-5.4.4/src -export IM_LIB=$CURRENT_PATH/im/lib/Linux62_64 +export IM_LIB=$CURRENT_PATH/im/lib/$LINUX_VERSION export IM_INC=$CURRENT_PATH/im/include -export FTGL_LIB=$CURRENT_PATH/ftgl/lib/Linux62_64 +export FTGL_LIB=$CURRENT_PATH/ftgl/lib/$LINUX_VERSION export FTGL_INC=$CURRENT_PATH/ftgl/include -export PDFLIB_LIB=$CURRENT_PATH/pdflib7/lib/Linux62_64 +export PDFLIB_LIB=$CURRENT_PATH/pdflib7/lib/$LINUX_VERSION export PDFLIB_INC=$CURRENT_PATH/pdflib7/include -export CD_LIB=$CURRENT_PATH/cd/lib/Linux62_64 +export CD_LIB=$CURRENT_PATH/cd/lib/$LINUX_VERSION export CD_INC=$CURRENT_PATH/cd/include cd lua-5.4.4 make linux ln -s liblua.a src/liblua54.a -mkdir -p $CURRENT_PATH/lua54/bin/Linux62_64 -ln -sf $LUA_LIB/lua $CURRENT_PATH/lua54/bin/Linux62_64/lua54 +mkdir -p $CURRENT_PATH/lua54/bin/$LINUX_VERSION +ln -sf $LUA_LIB/lua $CURRENT_PATH/lua54/bin/$LINUX_VERSION/lua54 cd ../pdflib7 make @@ -30,14 +31,14 @@ make cd ../ftgl make -# cd ../fftw -# ./configure --enable-shared --enable-sse --prefix=/usr -# make -j16 -# make install -# make clean -# ./configure --enable-shared --enable-float --prefix=/usr -# make -j16 -# make install +cd ../fftw +./configure --enable-shared --prefix=/usr +make -j16 +make install +make clean +./configure --enable-shared --enable-float--prefix=/usr +make -j16 +make install cd ../im make @@ -46,5 +47,5 @@ cd ../cd make cd ../iup -patch -p1 < without-lua-prefix-with-linux6.patch +# patch -p1 < without-lua-prefix-with-linux6.patch make