Skip to content

Commit

Permalink
Nix LWJGL stuff.
Browse files Browse the repository at this point in the history
Not actually sure how this works, I think we had a private branch...?
  • Loading branch information
raygreenwell committed Jul 25, 2016
1 parent f92a575 commit 2ff1079
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 46 deletions.
16 changes: 0 additions & 16 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,6 @@
description="Deploys our build artifacts to a Maven repository.">
<jar basedir="${src.dir}" destfile="${deploy.dir}/${ant.project.name}-sources.jar"/>
<jar basedir="${deploy.dir}/docs" destfile="${deploy.dir}/${ant.project.name}-javadoc.jar"/>
<jar basedir="lib/windows" destfile="${deploy.dir}/lwjgl-platform-natives-windows.jar"/>
<jar basedir="lib/macosx" destfile="${deploy.dir}/lwjgl-platform-natives-osx.jar"/>
<jar basedir="lib/linux" destfile="${deploy.dir}/lwjgl-platform-natives-linux.jar"/>
<artifact:deploy file="pom.xml" uniqueVersion="false">
<remoteRepository url="${maven.deploy.repo}"/>
<pom refid="pom"/>
Expand All @@ -190,18 +187,5 @@
<attach file="${deploy.dir}/${ant.project.name}-sources.jar" classifier="sources"/>
<attach file="${deploy.dir}/${ant.project.name}-javadoc.jar" classifier="javadoc"/>
</artifact:deploy>
<artifact:pom id="lwjgl-pom" file="lwjgl/pom.xml"/>
<artifact:deploy file="lib/lwjgl.jar" uniqueVersion="false">
<remoteRepository url="${maven.deploy.repo}"/>
<pom refid="lwjgl-pom"/>
<attach file="${deploy.dir}/lwjgl-platform-natives-windows.jar" classifier="natives-windows"/>
<attach file="${deploy.dir}/lwjgl-platform-natives-osx.jar" classifier="natives-osx"/>
<attach file="${deploy.dir}/lwjgl-platform-natives-linux.jar" classifier="natives-linux"/>
</artifact:deploy>
<artifact:pom id="lwjgl_util-pom" file="lwjgl_util/pom.xml"/>
<artifact:deploy file="lib/lwjgl_util.jar" uniqueVersion="false">
<remoteRepository url="${maven.deploy.repo}"/>
<pom refid="lwjgl_util-pom"/>
</artifact:deploy>
</target>
</project>
11 changes: 11 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,17 @@
<version>2.0.1</version>
</dependency>

<dependency>
<groupId>org.lwjgl.lwjgl</groupId>
<artifactId>lwjgl</artifactId>
<version>2.9.3</version>
</dependency>
<dependency>
<groupId>org.lwjgl.lwjgl</groupId>
<artifactId>lwjgl_util</artifactId>
<version>2.9.3</version>
</dependency>

<!-- normally we don't need guava explicitly but ooo-util is bringing in an old-ass version -->
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
14 changes: 0 additions & 14 deletions lwjgl/pom.xml

This file was deleted.

14 changes: 0 additions & 14 deletions lwjgl_util/pom.xml

This file was deleted.

2 changes: 0 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@

<modules>
<module>core</module>
<module>lwjgl</module>
<module>lwjgl_util</module>
</modules>

<repositories>
Expand Down

5 comments on commit 2ff1079

@taisel
Copy link

@taisel taisel commented on 2ff1079 Jul 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You guys still using LWJGL 2? That legacy branch has bugs they never fixed. Recently I had to file an issue just to document that they broke exclusive GPU access on mac when fullscreen'd (which trashes fps). Native OS X "fullscreen" is faster than the old fullscreen, which should make no sense, but LWJGL due to a bug added in 2.9.X doesn't tell the OS to stop drawing the desktop layer below anymore.

@raygreenwell
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would love to update to the latest, but it requires Java 8. The game using clyde is presently stuck on Java 6, and updating the JRE in our client installations is not a priority project right now.

@taisel
Copy link

@taisel taisel commented on 2ff1079 Jul 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might need to use the workaround on OS X then which is toggle mission control "native" fullscreen if available. That's the only way to exclusive gpu access on OS X in fullscreen now.

@raygreenwell
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah cool I will hopefully have that enabled soon.

@The-File
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see this project is in museum piece mode, but I ought to leave a remark.

#21

The very last distribution of LWJGL 2 seems necessary to play nice with Java 9+.
Some JNI error occurs with the other variants.

Please sign in to comment.