Skip to content

Apple Silicon (ARM) support + build fixes for modern Processing and JDK #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trackme518 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Apple Silicon (ARM) support + build fixes for modern Processing and JDK #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions resources/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,20 @@ sketchbook.location=${user.home}/Documents/Processing
# For OS X,the following path will direct you into Processing's application
# package, in case you put Processing inside your Applications folder.

classpath.local.location=/Applications/Processing.app/Contents/Java/core/library
# Processing 4.0 betas placed the jars in Contents/Java/core/library, while
# newer releases (4.1+) use Contents/app/resources/core/library and version the
# jar file names, hence the glob patterns below.

classpath.local.location=/Applications/Processing.app/Contents/app/resources/core/library


jsyphon.location=java/JSyphon

# Add all jar files that are required for compiling your project to the local
# and project classpath. Use a comma as delimiter. These jar files must be
# Add all jar files that are required for compiling your project to the local
# and project classpath. Use a comma as delimiter. These jar files must be
# inside your classpath.local.location folder.

classpath.local.include=core.jar, jsyphon.jar, jogl-all.jar
classpath.local.include=core*.jar, jogl-all-2*.jar


# Add processing's libraries folder to the classpath.
Expand Down Expand Up @@ -132,12 +136,12 @@ source.repository=https://github.com/Syphon/Processing.git
# This is used to compare different versions of the same library, and check if
# an update is available.

library.version=9
library.version=10


# The version as the user will see it.

library.prettyVersion=4.0
library.prettyVersion=4.1


# The min and max revision of Processing compatible with your library.
Expand All @@ -155,12 +159,12 @@ compatible.maxRevision=0
# against. This information is only used in the generated webpage.

tested.platform=macos
tested.processingVersion=4.0b7
tested.processingVersion=4.5.6


# Additional information for the generated webpage.

library.copyright=(c) 2011-2022
library.copyright=(c) 2011-2026
library.dependencies=opengl, syphon
library.keywords=frame sharing, realtime, osx, opengl

Expand Down
18 changes: 11 additions & 7 deletions resources/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,18 +215,22 @@ ${line}

<target name="generate.javadoc" if="is.normal">
<!-- create the java reference of the library -->
<javadoc bottom="Processing library ${project.name} by ${author.name}. ${library.copyright}"
classpath="${classpath.local.location}/core.jar;{project.bin}"
destdir="${project.tmp}/${project.name}/reference"
<javadoc bottom="Processing library ${project.name} by ${author.name}. ${library.copyright}"
destdir="${project.tmp}/${project.name}/reference"
verbose="false"
stylesheetfile="resources/stylesheet.css"
doctitle="Javadocs: ${project.name}"
public="true" version="false"
windowtitle="Javadocs: ${project.name}">
windowtitle="Javadocs: ${project.name}"
additionalparam="-Xdoclint:none -tag example:a:&quot;Example&quot;">

<link href="${javadoc.java.href}" />
<link href="${javadoc.processing.href}" />
<taglet name="ExampleTaglet" path="resources/code" />
<classpath>
<path refid="classpath"/>
<pathelement location="${project.bin}"/>
</classpath>
<link href="${javadoc.java.href}" />
<!-- The processing.org javadoc link is dropped: its package-list
URL no longer exists, which makes recent javadoc tools fail. -->
<fileset dir="${project.tmp}/${project.name}/src" defaultexcludes="yes">
<!-- add packages to be added to reference. -->
<include name="**/*"/>
Expand Down
4 changes: 2 additions & 2 deletions resources/library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ paragraph = Syphon is an open source macOS technology that allows applications t
# compare different versions of the same library, and check if an update is
# available. You should think of it as a counter, counting the total number of
# releases you've had.
version = 9 # This must be parsable as an int
version = 10 # This must be parsable as an int

# The version as the user will see it. If blank, the version attribute will be
# used here. This should be a single word, with no spaces.
prettyVersion = 4.0 # This is treated as a String
prettyVersion = 4.1 # This is treated as a String

# The min and max revision of Processing compatible with your library.
# Note that these fields use the revision and not the version of Processing,
Expand Down