Skip to content

Commit

Permalink
Switched to FreeBSD branch stable/12 (#54)
Browse files Browse the repository at this point in the history
* Test rebase to stable/12 branch
* Fix CocoaDemo Framework paths (#52)
  • Loading branch information
mszoek authored May 26, 2021
1 parent b6f903a commit f7b4fef
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BUILDROOT := ${OBJPREFIX}/buildroot
AIRYX_VERSION != head -1 ${TOPDIR}/version
AIRYX_CODENAME != tail -1 ${TOPDIR}/version
OSRELEASE := 12.2
FREEBSD_BRANCH := releng/${OSRELEASE}
FREEBSD_BRANCH := stable/${OSRELEASE:R}
MKINCDIR := -m/usr/share/mk -m${TOPDIR}/mk
CORES := 4

Expand Down
4 changes: 2 additions & 2 deletions examples/app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ SRCS=main.m MyView.m
MK_DEBUG_FILES=no
RESOURCES=rsc helium.jpg CocoaDemo.png
SLF=/System/Library/Frameworks
FRAMEWORKS=${SLF}/AppKit/AppKit ${SLF}/CoreGraphics ${SLF}/Onyx2D ${SLF}/OpenGL \
${SLF}/Foundation/Foundation ${SLF}/CoreFoundation ${SLF}/DBusKit/DBusKit
FRAMEWORKS=${SLF}/AppKit ${SLF}/CoreGraphics ${SLF}/Onyx2D ${SLF}/OpenGL \
${SLF}/Foundation ${SLF}/CoreFoundation ${SLF}/DBusKit
LDFLAGS+=-L/usr/local/lib -lGL

build: all
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0.2.2
0.2.3pre
Atomic

0 comments on commit f7b4fef

Please sign in to comment.