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

svn -> git conversion : fix build.

Browse Source
This commit is contained in:
Jean-François DEL NERO
2023-01-22 22:14:53 +01:00
parent 131290bf63
commit 77532f9c4d
8 changed files with 70 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HxCFloppyEmulator_cmdline/build/Makefile
+9 -9
View File
@@ -3,7 +3,7 @@ CC=gcc
TARGET := $(shell uname)
INCLUDES = -I ../sources -I ../../../libhxcfe/trunk/sources -I ../../../libusbhxcfe/trunk/sources
INCLUDES = -I ../sources -I ../../libhxcfe/sources -I ../../libusbhxcfe/sources
DEBUG ?= 0
DEBUG_ASAN ?= 0
@@ -61,19 +61,19 @@ endif
all: $(EXEC)
hxcfe.exe: hxcfe.o utils.o ../../../build/libhxcadaptor.a $(LIBHXCFE) $(LIBUSBHXCFE)
hxcfe.exe: hxcfe.o utils.o ../../build/libhxcadaptor.a $(LIBHXCFE) $(LIBUSBHXCFE)
$(CC) -o $@ $^ $(LDFLAGS)
cp $@ ../../../build
cp $@ ../../build
hxcfe: hxcfe.o utils.o ../../../build/libhxcadaptor.a $(LIBHXCFE) $(LIBUSBHXCFE)
hxcfe: hxcfe.o utils.o ../../build/libhxcadaptor.a $(LIBHXCFE) $(LIBUSBHXCFE)
$(CC) -o $@ $^ $(LDFLAGS)
cp $@ ../../../build
cp $@ ../../build
$(LIBHXCFE): ../../../build/$(LIBHXCFE)
ln ../../../build/$(LIBHXCFE) $(LIBHXCFE)
$(LIBHXCFE): ../../build/$(LIBHXCFE)
ln ../../build/$(LIBHXCFE) $(LIBHXCFE)
$(LIBUSBHXCFE): ../../../build/$(LIBUSBHXCFE)
ln ../../../build/$(LIBUSBHXCFE) $(LIBUSBHXCFE)
$(LIBUSBHXCFE): ../../build/$(LIBUSBHXCFE)
ln ../../build/$(LIBUSBHXCFE) $(LIBUSBHXCFE)
hxcfe.o: ../sources/hxcfe.c
$(CC) -o $@ -c $< $(CFLAGS)
HxCFloppyEmulator_software/build/Makefile
+9 -9
View File
@@ -6,7 +6,7 @@ CPP=g++
TARGET := $(shell uname)
BASEDIR=../sources
INCLUDES = -I$(BASEDIR) -I ../../../libhxcfe/trunk/sources -I $(BASEDIR)/gui -I $(BASEDIR)/thirdpartylibs/fltk/fltk-1.x.x/ -I ../../../libusbhxcfe/trunk/sources -I ../../../libhxcadaptor/trunk/sources -I $(BASEDIR)/gui/microintro/
INCLUDES = -I$(BASEDIR) -I ../../libhxcfe/sources -I $(BASEDIR)/gui -I $(BASEDIR)/thirdpartylibs/fltk/fltk-1.x.x/ -I ../../libusbhxcfe/sources -I ../../libhxcadaptor/sources -I $(BASEDIR)/gui/microintro/
DEBUG ?= 0
DEBUG_ASAN ?= 0
@@ -101,19 +101,19 @@ DATA_FILES: bmptoh
cd $(BASEDIR)/gui/microintro/data/ && ../converttools/bmptob8/bmptoh nao_gabber_astro.mod -DATA
cd $(BASEDIR)/gui/microintro/data/ && ../converttools/bmptob8/bmptoh ../../../../COPYING_FULL -DATA
HxCFloppyEmulator.exe: win32_hxcfloppy_res.o main.o utils.o $(GUI) $(MICROINTRO) loader.o soft_cfg_file.o fileselector.o $(FLTKLIB) $(LIBHXCFE) $(LIBUSBHXCFE) ../../../build/libhxcadaptor.a
HxCFloppyEmulator.exe: win32_hxcfloppy_res.o main.o utils.o $(GUI) $(MICROINTRO) loader.o soft_cfg_file.o fileselector.o $(FLTKLIB) $(LIBHXCFE) $(LIBUSBHXCFE) ../../build/libhxcadaptor.a
$(CPP) -o $@ $^ $(LDFLAGS)
cp $@ ../../../build
cp $@ ../../build
hxcfloppyemulator: main.o utils.o $(GUI) $(MICROINTRO) loader.o soft_cfg_file.o fileselector.o $(FLTKLIB) $(LIBHXCFE) $(LIBUSBHXCFE) ../../../build/libhxcadaptor.a
hxcfloppyemulator: main.o utils.o $(GUI) $(MICROINTRO) loader.o soft_cfg_file.o fileselector.o $(FLTKLIB) $(LIBHXCFE) $(LIBUSBHXCFE) ../../build/libhxcadaptor.a
$(CPP) -o $@ $^ $(LDFLAGS)
cp $@ ../../../build
cp $@ ../../build
$(LIBHXCFE): ../../../build/$(LIBHXCFE)
ln ../../../build/$(LIBHXCFE) $(LIBHXCFE)
$(LIBHXCFE): ../../build/$(LIBHXCFE)
ln ../../build/$(LIBHXCFE) $(LIBHXCFE)
$(LIBUSBHXCFE): ../../../build/$(LIBUSBHXCFE)
ln ../../../build/$(LIBUSBHXCFE) $(LIBUSBHXCFE)
$(LIBUSBHXCFE): ../../build/$(LIBUSBHXCFE)
ln ../../build/$(LIBUSBHXCFE) $(LIBUSBHXCFE)
win32_hxcfloppy_res.o: $(BASEDIR)/win32/hxcfloppy.rc
$(RESC) $< $@
build/Makefile
+33 -33
View File
@@ -3,69 +3,69 @@ TARGET := $(shell uname)
all: HxCFloppyEmulator_cmdline HxCFloppyEmulator_software
libhxcadaptor:
$(MAKE) -C ../libhxcadaptor/trunk/build/
$(MAKE) -C ../libhxcadaptor/build/
libhxcfe: libhxcadaptor libhxcfe
$(MAKE) -C ../libhxcfe/trunk/build/
$(MAKE) -C ../libhxcfe/build/
libusbhxcfe: libhxcadaptor
$(MAKE) -C ../libusbhxcfe/trunk/build/
$(MAKE) -C ../libusbhxcfe/build/
HxCFloppyEmulator_cmdline: libhxcfe libusbhxcfe
$(MAKE) -C ../HxCFloppyEmulator_cmdline/trunk/build/
$(MAKE) -C ../HxCFloppyEmulator_cmdline/build/
fltk:
chmod +x ../HxCFloppyEmulator_software/trunk/sources/thirdpartylibs/fltk/prepare_fltk.sh
cd ../HxCFloppyEmulator_software/trunk/sources/thirdpartylibs/fltk/ && ./prepare_fltk.sh
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/trunk/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/trunk/sources/thirdpartylibs/fltk/fltk-1.x.x/ DIRS=src CC=i686-w64-mingw32-gcc CPP=i686-w64-mingw32-g++
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/trunk/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/trunk/sources/thirdpartylibs/fltk/fltk-1.x.x/ DIRS=src CC=x86_64-w64-mingw32-gcc CPP=x86_64-w64-mingw32-g++
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/trunk/sources/thirdpartylibs/fltk && \
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=10.13 -arch arm64' && export CXXFLAGS='-mmacosx-version-min=10.13 -arch arm64' && export LDFLAGS='-mmacosx-version-min=10.13 -arch arm64' && ./configure --host=arm-apple-darwin
$(MAKE) -C ../HxCFloppyEmulator_software/trunk/sources/thirdpartylibs/fltk/fltk-1.x.x-arm64/ DIRS=src
cd ../HxCFloppyEmulator_software/trunk/sources/thirdpartylibs/fltk && \
$(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.13 -arch x86_64' && export CXXFLAGS='-mmacosx-version-min=10.13 -arch x86_64' && export LDFLAGS='-mmacosx-version-min=10.13 -arch x86_64' && ./configure --host=x86_64-apple-darwin
$(MAKE) -C ../HxCFloppyEmulator_software/trunk/sources/thirdpartylibs/fltk/fltk-1.x.x-x86_64/ DIRS=src
cd ../HxCFloppyEmulator_software/trunk/sources/thirdpartylibs/fltk && \
$(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/trunk/sources/thirdpartylibs/fltk && \
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/trunk/sources/thirdpartylibs/fltk/fltk-1.x.x/ DIRS=src
$(MAKE) -C ../HxCFloppyEmulator_software/sources/thirdpartylibs/fltk/fltk-1.x.x/ DIRS=src
endif
HxCFloppyEmulator_software: libhxcfe libusbhxcfe fltk
$(MAKE) -C ../HxCFloppyEmulator_software/trunk/build/
$(MAKE) -C ../HxCFloppyEmulator_software/build/
clean_fltk:
ifneq ("$(wildcard ../HxCFloppyEmulator_software/trunk/sources/thirdpartylibs/fltk/fltk-1.x.x/Makefile)","")
$(MAKE) -C ../HxCFloppyEmulator_software/trunk/sources/thirdpartylibs/fltk/fltk-1.x.x/ clean
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
clean: clean_fltk
$(MAKE) -C ../libhxcadaptor/trunk/build/ clean
$(MAKE) -C ../libhxcfe/trunk/build/ clean
$(MAKE) -C ../libusbhxcfe/trunk/build/ clean
$(MAKE) -C ../HxCFloppyEmulator_cmdline/trunk/build/ clean
$(MAKE) -C ../HxCFloppyEmulator_software/trunk/build/ clean
$(MAKE) -C ../libhxcadaptor/build/ clean
$(MAKE) -C ../libhxcfe/build/ clean
$(MAKE) -C ../libusbhxcfe/build/ clean
$(MAKE) -C ../HxCFloppyEmulator_cmdline/build/ clean
$(MAKE) -C ../HxCFloppyEmulator_software/build/ clean
mrproper:
$(MAKE) -C ../libhxcadaptor/trunk/build/ mrproper
$(MAKE) -C ../libhxcfe/trunk/build/ mrproper
$(MAKE) -C ../libusbhxcfe/trunk/build/ mrproper
$(MAKE) -C ../HxCFloppyEmulator_cmdline/trunk/build/ mrproper
$(MAKE) -C ../HxCFloppyEmulator_software/trunk/build/ mrproper
$(MAKE) -C ../libhxcadaptor/build/ mrproper
$(MAKE) -C ../libhxcfe/build/ mrproper
$(MAKE) -C ../libusbhxcfe/build/ mrproper
$(MAKE) -C ../HxCFloppyEmulator_cmdline/build/ mrproper
$(MAKE) -C ../HxCFloppyEmulator_software/build/ mrproper
-rm -rf *.so
-rm -rf *.a
-rm -rf *.obj
@@ -84,8 +84,8 @@ mrproper:
-rm -rf Debug_*
-rm -rf Release_*
-rm -rf ADFOpus_*
-rm -rf ../HxCFloppyEmulator_software/trunk/sources/thirdpartylibs/fltk/fltk-1.x.x
-rm -rf ../HxCFloppyEmulator_software/trunk/sources/thirdpartylibs/fltk/fltk-1.x.x-arm64
-rm -rf ../HxCFloppyEmulator_software/trunk/sources/thirdpartylibs/fltk/fltk-1.x.x-x86_64
-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
.PHONY: libhxcadaptor libhxcfe libusbhxcfe HxCFloppyEmulator_cmdline HxCFloppyEmulator_software fltk mrproper clean
build/maccreatebundle
+1 -1
View File
@@ -29,7 +29,7 @@ mkdir ${GUI_PATH}/Contents/MacOS
mkdir ${GUI_PATH}/Contents/Frameworks
echo APPLnone > ${GUI_PATH}/Contents/PkgInfo
iconutil --convert icns --output ${GUI_PATH}/Contents/Resources/icons.icns ../HxCFloppyEmulator_software/trunk/sources/mac/icons/hxcfloppyemulator.iconset/
iconutil --convert icns --output ${GUI_PATH}/Contents/Resources/icons.icns ../HxCFloppyEmulator_software/sources/mac/icons/hxcfloppyemulator.iconset/
cp hxcfloppyemulator ${GUI_PATH}/Contents/MacOS/${GUI_EXEC}
chmod 755 ${GUI_PATH}/Contents/MacOS/${GUI_EXEC}
cp libhxcfe.dylib ${GUI_PATH}/Contents/Frameworks
libhxcadaptor/build/Makefile
+2 -2
View File
@@ -5,7 +5,7 @@ AR=ar
TARGET := $(shell uname)
BASEDIR=../sources
INCLUDES = -I$(BASEDIR)/ -I ../../../libhxcfe/trunk/sources -I ../../../libusbhxcfe/trunk/sources
INCLUDES = -I$(BASEDIR)/ -I ../../libhxcfe/sources -I ../../libusbhxcfe/sources
DEBUG ?= 0
DEBUG_ASAN ?= 0
@@ -54,7 +54,7 @@ ifeq ($(TARGET), Darwin)
else
$(AR) r $@ $^
endif
cp $@ ../../../build
cp $@ ../../build
libhxcadaptor.o: $(BASEDIR)/libhxcadaptor.c
$(CC) -o $@ -c $< $(CFLAGS)
libhxcfe/build/Makefile
+8 -8
View File
@@ -6,7 +6,7 @@ AR=ar
TARGET := $(shell uname)
BASEDIR=../sources
INCLUDES = -I$(BASEDIR)/ -I ../../../libhxcadaptor/trunk/sources
INCLUDES = -I$(BASEDIR)/ -I ../../libhxcadaptor/sources
DEBUG ?= 0
DEBUG_ASAN ?= 0
@@ -126,13 +126,13 @@ BMP_FILES: bmptoh $(BMP_DATAFILES_OUTPUTS)
SCRIPT_FILE: bmptoh $(BASEDIR)/init_script.h
libhxcfe.dll: win32_libhxcfe_res.o $(LIBS_OBJS) ../../../build/libhxcadaptor.a
libhxcfe.dll: win32_libhxcfe_res.o $(LIBS_OBJS) ../../build/libhxcadaptor.a
$(CC) -o $@ $^ $(LDFLAGS)
cp $@ ../../../build
cp $@ ../../build
libhxcfe.dylib: $(LIBS_OBJS) ../../../build/libhxcadaptor.a
libhxcfe.dylib: $(LIBS_OBJS) ../../build/libhxcadaptor.a
$(CC) -o $@ $^ $(LDFLAGS)
cp $@ ../../../build
cp $@ ../../build
libhxcfe.a: $(LIBS_OBJS)
ifeq ($(TARGET), Darwin)
@@ -140,11 +140,11 @@ ifeq ($(TARGET), Darwin)
else
$(AR) r $@ $^
endif
cp $@ ../../../build
cp $@ ../../build
libhxcfe.so: $(LIBS_OBJS) ../../../build/libhxcadaptor.a
libhxcfe.so: $(LIBS_OBJS) ../../build/libhxcadaptor.a
$(CC) -o $@ $^ $(LDFLAGS)
cp $@ ../../../build
cp $@ ../../build
win32_libhxcfe_res.o: $(BASEDIR)/win32/libhxcfe.rc
$(RESC) $< $@
libusbhxcfe/build/Makefile
+7 -7
View File
@@ -5,7 +5,7 @@ AR=ar
TARGET := $(shell uname)
BASEDIR=../sources
INCLUDES = -I$(BASEDIR)/ -I ../../../libhxcfe/trunk/sources -I ../sources/win32 -I ../../../libhxcadaptor/trunk/sources
INCLUDES = -I$(BASEDIR)/ -I ../../libhxcfe/sources -I ../sources/win32 -I ../../libhxcadaptor/sources
DEBUG ?= 0
DEBUG_ASAN ?= 0
@@ -57,13 +57,13 @@ endif
all: $(EXEC)
libusbhxcfe.dll: win32_libusbhxcfe_res.o usb_hxcfloppyemulator.o variablebitrate.o ftdi.o ../../../build/libhxcadaptor.a ../../../build/libhxcfe.dll
libusbhxcfe.dll: win32_libusbhxcfe_res.o usb_hxcfloppyemulator.o variablebitrate.o ftdi.o ../../build/libhxcadaptor.a ../../build/libhxcfe.dll
$(CC) -o $@ $^ $(LDFLAGS)
cp $@ ../../../build
cp $@ ../../build
libusbhxcfe.dylib: usb_hxcfloppyemulator.o variablebitrate.o ftdi.o ../../../build/libhxcadaptor.a ../../../build/libhxcfe.dylib
libusbhxcfe.dylib: usb_hxcfloppyemulator.o variablebitrate.o ftdi.o ../../build/libhxcadaptor.a ../../build/libhxcfe.dylib
$(CC) -o $@ $^ $(LDFLAGS)
cp $@ ../../../build
cp $@ ../../build
libusbhxcfe.a: usb_hxcfloppyemulator.o variablebitrate.o ftdi.o
ifeq ($(TARGET), Darwin)
@@ -71,11 +71,11 @@ ifeq ($(TARGET), Darwin)
else
$(AR) r $@ $^
endif
cp $@ ../../../build
cp $@ ../../build
libusbhxcfe.so: usb_hxcfloppyemulator.o variablebitrate.o ftdi.o
$(CC) -o $@ $^ $(LDFLAGS)
cp $@ ../../../build
cp $@ ../../build
win32_libusbhxcfe_res.o: $(BASEDIR)/win32/libusbhxcfe.rc
$(RESC) $< $@
readme.txt
+1 -37
View File
@@ -12,7 +12,7 @@ HxC Floppy Emulator project
Generic/universal floppy disk drive emulators
Copyright (C) 2006-2020 Jean-François DEL NERO / HxC2001
Copyright (C) 2006-2023 Jean-François DEL NERO / HxC2001
Email : hxc2001(at)hxc2001.com
@@ -52,43 +52,7 @@ HxC Floppy Emulator GUI software
System calls helper/wrapper library.
(Windows, Linux, macOS)
-------------------------------------------------------------------------------
.\vfd_hxc\
Virtual Floppy Drive 2.1 sources patched For the SD HxC Floppy Emulator.
(Windows)
-------------------------------------------------------------------------------
.\AdfOpus_hxc\
Adf Opus sources patched for the SD HxC Floppy Emulator
(Windows)
-------------------------------------------------------------------------------
.\HxCFloppyEmulator_file_selector\
File selector for Amiga, Amstrad CPC and Atari ST.
(Amiga, Amstrad CPC, Atari ST)
Important note ! : Updates are now done on Github for this part :
https://github.com/jfdelnero/HXCFE_file_selector
-------------------------------------------------------------------------------
.\HxCFloppyEmulator_HxCMount\
HxCMount hard drive emulator for Atari ST
(Atari ST)
Important note ! : Updates are now done on Github for this part :
https://github.com/gbouthenot/hxcmount
https://github.com/jfdelnero/hxcmount
-------------------------------------------------------------------------------
.\USB_HxCFloppyEmulator\
USB HxC Floppy Emulator schematic, PCB, VHDL code and CPLD bitstream.
-------------------------------------------------------------------------------
.\build\
Build folder.
-------------------------------------------------------------------------------
.\Pauline\
de10-nano/FPGA based quad floppy simulator and floppy dumper/preservation tool.
(Universal/Web based/network interfaces)
-------------------------------------------------------------------------------