Michel2/HxCFloppyEmulator
1
0
Fork 0
mirror of https://github.com/jfdelnero/HxCFloppyEmulator.git synced 2026-07-28 04:06:36 +00:00
Code Issues Releases Activity

use fltk 1.4.x for macOs.

Browse Source
This commit is contained in:
Jean-François DEL NERO
2023-02-06 00:02:01 +01:00
parent 3ebc35892e
commit 70337f12f1
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HxCFloppyEmulator_software/build/Makefile
+9 -3
View File
@@ -119,16 +119,20 @@ ifneq (,$(findstring arm64,$(MACOSX_ARCH)))
lipo fltk-1.x.x-x86_64/lib/libfltk_forms.a fltk-1.x.x-arm64/lib/libfltk_forms.a -create -output fltk-1.x.x/lib/libfltk_forms.a && \
lipo fltk-1.x.x-x86_64/lib/libfltk_gl.a fltk-1.x.x-arm64/lib/libfltk_gl.a -create -output fltk-1.x.x/lib/libfltk_gl.a && \
lipo fltk-1.x.x-x86_64/lib/libfltk_images.a fltk-1.x.x-arm64/lib/libfltk_images.a -create -output fltk-1.x.x/lib/libfltk_images.a
cd ../sources/thirdpartylibs/fltk && \
-cd ../sources/thirdpartylibs/fltk && \
cp fltk-1.x.x-x86_64/FL/abi-version.h fltk-1.x.x/FL/abi-version.h
-cd ../sources/thirdpartylibs/fltk && \
cp fltk-1.x.x-x86_64/FL/fl_config.h fltk-1.x.x/FL/fl_config.h
else
cd ../sources/thirdpartylibs/fltk && \
cp fltk-1.x.x-x86_64/lib/libfltk.a fltk-1.x.x/lib/libfltk.a && \
cp fltk-1.x.x-x86_64/lib/libfltk_forms.a fltk-1.x.x/lib/libfltk_forms.a && \
cp fltk-1.x.x-x86_64/lib/libfltk_gl.a fltk-1.x.x/lib/libfltk_gl.a && \
cp fltk-1.x.x-x86_64/lib/libfltk_images.a fltk-1.x.x/lib/libfltk_images.a
cd ../sources/thirdpartylibs/fltk && \
-cd ../sources/thirdpartylibs/fltk && \
cp fltk-1.x.x-x86_64/FL/abi-version.h fltk-1.x.x/FL/abi-version.h
-cd ../sources/thirdpartylibs/fltk && \
cp fltk-1.x.x-x86_64/FL/fl_config.h fltk-1.x.x/FL/fl_config.h
endif
else
ifneq (,$(findstring arm64,$(MACOSX_ARCH)))
@@ -137,8 +141,10 @@ ifneq (,$(findstring arm64,$(MACOSX_ARCH)))
cp fltk-1.x.x-arm64/lib/libfltk_forms.a fltk-1.x.x/lib/libfltk_forms.a && \
cp fltk-1.x.x-arm64/lib/libfltk_gl.a fltk-1.x.x/lib/libfltk_gl.a && \
cp fltk-1.x.x-arm64/lib/libfltk_images.a fltk-1.x.x/lib/libfltk_images.a
cd ../sources/thirdpartylibs/fltk && \
-cd ../sources/thirdpartylibs/fltk && \
cp fltk-1.x.x-arm64/FL/abi-version.h fltk-1.x.x/FL/abi-version.h
-cd ../sources/thirdpartylibs/fltk && \
cp fltk-1.x.x-arm64/FL/fl_config.h fltk-1.x.x/FL/fl_config.h
endif
endif
else
HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/prepare_fltk.sh
+11 -2
View File
@@ -1,12 +1,21 @@
if [ $OSTYPE == 'darwin'* ]; then
export DOWNLOADURL=https://www.fltk.org/pub/fltk/snapshots/fltk-1.4.x-20230203-8178d005.tar.gz
export ARCHIVENAMEBASE=fltk-1.4.x-20230203-8178d005
export PATCHFILE=
export FOLDERNAME=fltk-1.4.x-20230203-8178d005
else
export DOWNLOADURL=https://www.fltk.org/pub/fltk/1.3.8/fltk-1.3.8-source.tar.gz
export ARCHIVENAMEBASE=fltk-1.3.8-source
export PATCHFILE=fltk-1.3.8.patch
export FOLDERNAME=fltk-1.3.8
fi
if [ ! -d fltk-1.x.x ]; then
wget $DOWNLOADURL -nc || exit 1
tar -xzf ${ARCHIVENAMEBASE}.tar.gz
mv ${FOLDERNAME} fltk-1.x.x
patch -i ../${PATCHFILE} -p1 -d fltk-1.x.x
if [ -n ${PATCHFILE} ]; then
patch -i ../${PATCHFILE} -p1 -d fltk-1.x.x
fi
fi