Michel2/HxCFloppyEmulator
1
0
Fork 0
mirror of https://github.com/jfdelnero/HxCFloppyEmulator.git synced 2026-07-27 19:56:23 +00:00
Code Issues Releases Activity

fltk build moved to the hxc software makefile.

Browse Source
This commit is contained in:
Jean-François DEL NERO
2023-02-04 14:54:21 +01:00
parent 1a4a50aa81
commit f677b6d8a3
5 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HxCFloppyEmulator_software/build/Makefile
+42 -3
View File
@@ -66,9 +66,10 @@ EXEC=HxCFloppyEmulator.exe
endif
ifeq ($(TARGET), Darwin)
MACOSX_ARCH ?= -arch arm64 -arch x86_64
MACOSX_MIN_VER ?= 10.9
CFLAGS += -DOSX -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_MIN_VER}
LDFLAGS += -lc -lm -ldl -lpthread -framework Cocoa -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_MIN_VER}
CFLAGS += -DOSX ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
LDFLAGS += -lc -lm -ldl -lpthread -framework Cocoa ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
LIBHXCFE = libhxcfe.dylib
LIBUSBHXCFE = libusbhxcfe.dylib
else
@@ -82,8 +83,38 @@ GUI = main_gui.o msg_txt.o gui_strings.o about_gui.o batch_converter_window.o fl
MICROINTRO = microintro.o lzw.o pack.o rle.o hxcmod.o
FLTKLIB = $(BASEDIR)/thirdpartylibs/fltk/fltk-1.x.x/lib/libfltk.a $(BASEDIR)/thirdpartylibs/fltk/fltk-1.x.x/lib/libfltk_images.a
all: fltk DATA_FILES $(EXEC)
all: DATA_FILES $(EXEC)
fltk:
chmod +x ../sources/thirdpartylibs/fltk/prepare_fltk.sh
cd ../sources/thirdpartylibs/fltk/ && ./prepare_fltk.sh
ifeq ($(TARGET), mingw32)
cd ../sources/thirdpartylibs/fltk/fltk-1.x.x/ && export LDFLAGS='-static-libstdc++ -static-libgcc' && ./configure --host=i686-w64-mingw32 --prefix=/usr/share/mingw-w64
$(MAKE) -C ../sources/thirdpartylibs/fltk/fltk-1.x.x/ DIRS=src CC=i686-w64-mingw32-gcc CPP=i686-w64-mingw32-g++
else ifeq ($(TARGET), mingw64)
cd ../sources/thirdpartylibs/fltk/fltk-1.x.x/ && export LDFLAGS='-static-libstdc++ -static-libgcc' && ./configure --host=x86_64-w64-mingw32 --prefix=/usr/share/mingw-w64
$(MAKE) -C ../sources/thirdpartylibs/fltk/fltk-1.x.x/ DIRS=src CC=x86_64-w64-mingw32-gcc CPP=x86_64-w64-mingw32-g++
else ifeq ($(TARGET), Darwin)
cd ../sources/thirdpartylibs/fltk && \
cp -a fltk-1.x.x fltk-1.x.x-arm64 && \
cd fltk-1.x.x-arm64 && \
export CFLAGS='-mmacosx-version-min=11 -arch arm64' && export CXXFLAGS='-mmacosx-version-min=11 -arch arm64' && export LDFLAGS='-mmacosx-version-min=11 -arch arm64' && ./configure --host=arm-apple-darwin
$(MAKE) -C ../sources/thirdpartylibs/fltk/fltk-1.x.x-arm64/ DIRS=src
cd ../sources/thirdpartylibs/fltk && \
cp -a fltk-1.x.x fltk-1.x.x-x86_64 && \
cd fltk-1.x.x-x86_64 && \
export CFLAGS='-mmacosx-version-min=10.9 -arch x86_64' && export CXXFLAGS='-mmacosx-version-min=10.9 -arch x86_64' && export LDFLAGS='-mmacosx-version-min=10.9 -arch x86_64' && ./configure --host=x86_64-apple-darwin
$(MAKE) -C ../sources/thirdpartylibs/fltk/fltk-1.x.x-x86_64/ DIRS=src
cd ../sources/thirdpartylibs/fltk && \
lipo fltk-1.x.x-x86_64/lib/libfltk.a fltk-1.x.x-arm64/lib/libfltk.a -create -output fltk-1.x.x/lib/libfltk.a && \
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 && \
cp fltk-1.x.x-x86_64/FL/abi-version.h fltk-1.x.x/FL/abi-version.h
else
$(MAKE) -C ../sources/thirdpartylibs/fltk/fltk-1.x.x/ DIRS=src
endif
DATA_FILES: bmptoh
cd $(BASEDIR)/gui/microintro/data/ && ../converttools/bmptob8/bmptoh sob.bmp -BMP8P
@@ -235,9 +266,17 @@ clean:
rm -rf *.dll
rm -rf *.map
clean_fltk:
ifneq ("$(wildcard ../sources/thirdpartylibs/fltk/fltk-1.x.x/Makefile)","")
$(MAKE) -C ../sources/thirdpartylibs/fltk/fltk-1.x.x/ clean
endif
mrproper: clean
rm -rf $(EXEC)
rm -rf *.map *.ncb *.opt *.plg *.dll *.exe *.bak *.dylib
$(MAKE) -C $(BASEDIR)/gui/microintro/converttools/bmptob8 mrproper
-rm -rf ../sources/thirdpartylibs/fltk/fltk-1.x.x
-rm -rf ../sources/thirdpartylibs/fltk/fltk-1.x.x-arm64
-rm -rf ../sources/thirdpartylibs/fltk/fltk-1.x.x-x86_64
.PHONY: clean mrproper
build/Makefile
+3 -39
View File
@@ -14,44 +14,11 @@ libusbhxcfe: libhxcadaptor libhxcfe
HxCFloppyEmulator_cmdline: libhxcfe libusbhxcfe
$(MAKE) -C ../HxCFloppyEmulator_cmdline/build/
fltk:
chmod +x ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/prepare_fltk.sh
cd ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/ && ./prepare_fltk.sh
ifeq ($(TARGET), mingw32)
cd ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x/ && export LDFLAGS='-static-libstdc++ -static-libgcc' && ./configure --host=i686-w64-mingw32 --prefix=/usr/share/mingw-w64
$(MAKE) -C ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x/ DIRS=src CC=i686-w64-mingw32-gcc CPP=i686-w64-mingw32-g++
else ifeq ($(TARGET), mingw64)
cd ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x/ && export LDFLAGS='-static-libstdc++ -static-libgcc' && ./configure --host=x86_64-w64-mingw32 --prefix=/usr/share/mingw-w64
$(MAKE) -C ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x/ DIRS=src CC=x86_64-w64-mingw32-gcc CPP=x86_64-w64-mingw32-g++
else ifeq ($(TARGET), Darwin)
cd ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk && \
cp -a fltk-1.x.x fltk-1.x.x-arm64 && \
cd fltk-1.x.x-arm64 && \
export CFLAGS='-mmacosx-version-min=11 -arch arm64' && export CXXFLAGS='-mmacosx-version-min=11 -arch arm64' && export LDFLAGS='-mmacosx-version-min=11 -arch arm64' && ./configure --host=arm-apple-darwin
$(MAKE) -C ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x-arm64/ DIRS=src
cd ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk && \
cp -a fltk-1.x.x fltk-1.x.x-x86_64 && \
cd fltk-1.x.x-x86_64 && \
export CFLAGS='-mmacosx-version-min=10.9 -arch x86_64' && export CXXFLAGS='-mmacosx-version-min=10.9 -arch x86_64' && export LDFLAGS='-mmacosx-version-min=10.9 -arch x86_64' && ./configure --host=x86_64-apple-darwin
$(MAKE) -C ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x-x86_64/ DIRS=src
cd ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk && \
lipo fltk-1.x.x-x86_64/lib/libfltk.a fltk-1.x.x-arm64/lib/libfltk.a -create -output fltk-1.x.x/lib/libfltk.a && \
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 ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk && \
cp fltk-1.x.x-x86_64/FL/abi-version.h fltk-1.x.x/FL/abi-version.h
else
$(MAKE) -C ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x/ DIRS=src
endif
HxCFloppyEmulator_software: libhxcfe libusbhxcfe fltk
HxCFloppyEmulator_software: libhxcfe libusbhxcfe
$(MAKE) -C ../HxCFloppyEmulator_software/build/
clean_fltk:
ifneq ("$(wildcard ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x/Makefile)","")
$(MAKE) -C ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x/ clean
endif
$(MAKE) -C ../HxCFloppyEmulator_software/build/ clean_fltk
tests: all
cd ../tests/ && ./run.sh
@@ -87,11 +54,8 @@ mrproper:
-rm -rf Debug_*
-rm -rf Release_*
-rm -rf ADFOpus_*
-rm -rf ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x
-rm -rf ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x-arm64
-rm -rf ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x-x86_64
-rm -rf ../tests/run
-rm -rf HxCFloppyEmulator_Software
-rm -rf *.zip
.PHONY: libhxcadaptor libhxcfe libusbhxcfe HxCFloppyEmulator_cmdline HxCFloppyEmulator_software fltk mrproper clean
.PHONY: libhxcadaptor libhxcfe libusbhxcfe HxCFloppyEmulator_cmdline HxCFloppyEmulator_software mrproper clean
libhxcadaptor/build/Makefile
+3 -2
View File
@@ -39,9 +39,10 @@ LDFLAGS += -lc -lm -ldl
endif
ifeq ($(TARGET), Darwin)
MACOSX_ARCH ?= -arch arm64 -arch x86_64
MACOSX_MIN_VER ?= 10.9
CFLAGS += -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_MIN_VER}
LDFLAGS += -lc -lm -ldl -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_MIN_VER}
CFLAGS += ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
LDFLAGS += -lc -lm -ldl ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
endif
EXEC=libhxcadaptor.a
libhxcfe/build/Makefile
+3 -2
View File
@@ -51,9 +51,10 @@ EXEC=libhxcfe.dll
endif
ifeq ($(TARGET), Darwin)
MACOSX_ARCH ?= -arch arm64 -arch x86_64
MACOSX_MIN_VER ?= 10.9
CFLAGS += -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_MIN_VER}
LDFLAGS += -lc -lm -ldl -arch arm64 -arch x86_64 -dynamiclib -current_version 2.0 -install_name @executable_path/../Frameworks/libhxcfe.dylib -mmacosx-version-min=${MACOSX_MIN_VER}
CFLAGS += ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
LDFLAGS += -lc -lm -ldl ${MACOSX_ARCH} -dynamiclib -current_version 2.0 -install_name @executable_path/../Frameworks/libhxcfe.dylib -mmacosx-version-min=${MACOSX_MIN_VER}
EXEC=libhxcfe.dylib
endif
libusbhxcfe/build/Makefile
+3 -2
View File
@@ -45,9 +45,10 @@ EXEC=libusbhxcfe.dll
endif
ifeq ($(TARGET), Darwin)
MACOSX_ARCH ?= -arch arm64 -arch x86_64
MACOSX_MIN_VER ?= 10.9
CFLAGS += -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_MIN_VER}
LDFLAGS += -lc -lm -ldl -arch arm64 -arch x86_64 -dynamiclib -current_version 2.0 -install_name @executable_path/../Frameworks/libusbhxcfe.dylib -mmacosx-version-min=${MACOSX_MIN_VER}
CFLAGS += ${MACOSX_ARCH} -mmacosx-version-min=${MACOSX_MIN_VER}
LDFLAGS += -lc -lm -ldl ${MACOSX_ARCH} -dynamiclib -current_version 2.0 -install_name @executable_path/../Frameworks/libusbhxcfe.dylib -mmacosx-version-min=${MACOSX_MIN_VER}
EXEC=libusbhxcfe.dylib
endif