Skip to content

Commit

Permalink
Merge pull request #4 from olepoeschl/lwjgl3
Browse files Browse the repository at this point in the history
Lwjgl3 Migration
  • Loading branch information
olepoeschl authored Feb 1, 2022
2 parents fd0b5a2 + 572a7c3 commit f4912c6
Show file tree
Hide file tree
Showing 34 changed files with 439 additions and 324 deletions.
19 changes: 18 additions & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,23 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5"/>
<classpathentry kind="lib" path="deps/lwjgl2.9.3/lwjgl.jar"/>
<classpathentry kind="lib" path="deps/lwjgl/lwjgl.jar" sourcepath="deps/lwjgl/lwjgl-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/NQueensFAF%20Library/deps/lwjgl/lwjgl-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="deps/lwjgl/lwjgl-natives-linux.jar"/>
<classpathentry kind="lib" path="deps/lwjgl/lwjgl-natives-linux-arm32.jar"/>
<classpathentry kind="lib" path="deps/lwjgl/lwjgl-natives-linux-arm64.jar"/>
<classpathentry kind="lib" path="deps/lwjgl/lwjgl-natives-macos.jar"/>
<classpathentry kind="lib" path="deps/lwjgl/lwjgl-natives-macos-arm64.jar"/>
<classpathentry kind="lib" path="deps/lwjgl/lwjgl-natives-windows.jar"/>
<classpathentry kind="lib" path="deps/lwjgl/lwjgl-natives-windows-arm64.jar"/>
<classpathentry kind="lib" path="deps/lwjgl/lwjgl-natives-windows-x86.jar"/>
<classpathentry kind="lib" path="deps/lwjgl/lwjgl-opencl.jar" sourcepath="deps/lwjgl/lwjgl-opencl-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:platform:/resource/NQueensFAF%20Library/deps/lwjgl/lwjgl-opencl-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
29 changes: 29 additions & 0 deletions deps/lwjgl/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Copyright (c) 2012-present Lightweight Java Game Library
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

- Neither the name Lightweight Java Game Library nor the names of
its contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1 change: 1 addition & 0 deletions deps/lwjgl/build.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LWJGL 3.3.0 build 21
22 changes: 22 additions & 0 deletions deps/lwjgl/khronos_license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
** Copyright (c) 2013-2014 The Khronos Group Inc.
**
** Permission is hereby granted, free of charge, to any person obtaining a
** copy of this software and/or associated documentation files (the
** "Materials"), to deal in the Materials without restriction, including
** without limitation the rights to use, copy, modify, merge, publish,
** distribute, sublicense, and/or sell copies of the Materials, and to
** permit persons to whom the Materials are furnished to do so, subject to
** the following conditions:
**
** The above copyright notice and this permission notice shall be included
** in all copies or substantial portions of the Materials.
**
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
*/
21 changes: 21 additions & 0 deletions deps/lwjgl/libffi_license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
libffi - Copyright (c) 1996-2020 Anthony Green, Red Hat, Inc and others.
See source files for details.

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
``Software''), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Binary file added deps/lwjgl/lwjgl-javadoc.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-natives-linux-arm32.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-natives-linux-arm64.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-natives-linux.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-natives-macos-arm64.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-natives-macos.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-natives-windows-arm64.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-natives-windows-x86.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-natives-windows.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-opencl-javadoc.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-opencl-sources.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-opencl.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl-sources.jar
Binary file not shown.
Binary file added deps/lwjgl/lwjgl.jar
Binary file not shown.
38 changes: 0 additions & 38 deletions deps/lwjgl2.9.3/CREDITS

This file was deleted.

31 changes: 0 additions & 31 deletions deps/lwjgl2.9.3/LICENSE

This file was deleted.

Binary file removed deps/lwjgl2.9.3/lwjgl.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion src/de/nqueensfaf/SolverTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void testGpuSolver() {
// e1.printStackTrace();
// }
GpuSolver s = new GpuSolver();
s.setDevice(0);
s.setDevice(1);
s.setProgressUpdatesEnabled(false);
s.setN(18);
new Thread(() -> {
Expand Down
Loading

0 comments on commit f4912c6

Please sign in to comment.