Michel2/HxCFloppyEmulator
1
0 Fork 0
mirror of https://github.com/jfdelnero/HxCFloppyEmulator.git synced 2026-10-26 22:10:31 +00:00
Code Issues Releases Activity

Merge pull request #2 from d235j/main

Browse Source 
macOs CI
This commit is contained in:
Jean-François DEL NERO authored and GitHub committed 2023-01-31 22:19:39 +01:00
2 parents 8934e0840a 3009c52582
commit 9ceb6ba7c9
7 files changed
+33 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/ci-macos.yml
+26
View File
@@ -0,0 +1,26 @@
name: CI (macOS)
on:
push:
paths:
- '**'
pull_request:
paths:
- '**'
permissions:
contents: read
jobs:
build-macos:
runs-on: macOS-latest
steps:
- uses: actions/checkout@master
- name: Build
run: cd build && make -j2
- name: Package
run: cd build && ./maccreatebundle
- uses: actions/upload-artifact@master
with:
name: hxcfloppyemulator-macos-${{ github.sha }}
path: build/HxCFloppyEmulator.dmg
HxCFloppyEmulator_cmdline/build/Makefile
+1 -1
View File
@@ -26,7 +26,7 @@ LIBHXCFE = libhxcfe.so
LIBUSBHXCFE = libusbhxcfe.so
ifeq ($(TARGET), Darwin)
MACOSX_MIN_VER ?= 10.13
MACOSX_MIN_VER ?= 10.9
CFLAGS += -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_MIN_VER}
LDFLAGS += -lc -lm -ldl -lpthread -arch arm64 -arch x86_64 -mmacosx-version-min=${MACOSX_MIN_VER}
LIBHXCFE= libhxcfe.dylib
HxCFloppyEmulator_software/build/Makefile
+1 -1
View File
@@ -66,7 +66,7 @@ EXEC=HxCFloppyEmulator.exe
endif
ifeq ($(TARGET), Darwin)
MACOSX_MIN_VER ?= 10.13
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}
LIBHXCFE = libhxcfe.dylib
build/Makefile
+2 -2
View File
@@ -27,12 +27,12 @@ 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=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
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.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
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 && \
libhxcadaptor/build/Makefile
+1 -1
View File
@@ -39,7 +39,7 @@ LDFLAGS += -lc -lm -ldl
endif
ifeq ($(TARGET), Darwin)
MACOSX_MIN_VER ?= 10.13
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}
endif
libhxcfe/build/Makefile
+1 -1
View File
@@ -51,7 +51,7 @@ EXEC=libhxcfe.dll
endif
ifeq ($(TARGET), Darwin)
MACOSX_MIN_VER ?= 10.13
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}
EXEC=libhxcfe.dylib
libusbhxcfe/build/Makefile
+1 -1
View File
@@ -45,7 +45,7 @@ EXEC=libusbhxcfe.dll
endif
ifeq ($(TARGET), Darwin)
MACOSX_MIN_VER ?= 10.13
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}
EXEC=libusbhxcfe.dylib