From 5f4292bb8a310489e05a4f3545ae081310a93f72 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sun, 18 Aug 2019 23:56:42 +0200 Subject: Build Update: CMake 2.8.10.2 -> 3.15.2 (Windows + MacOS), Mingw64 4.8.1 -> 8.1.0 --- LICENSE.txt | 2 +- doc/HowToBuild.html | 34 ++++++++++++++++++--------------- make/build-test.xml | 18 ++++++++++------- make/scripts/java-win32.bat | 4 ++-- make/scripts/java-win64.bat | 4 ++-- make/scripts/make.gluegen.all.win32.bat | 6 +++--- make/scripts/make.gluegen.all.win64.bat | 2 +- 7 files changed, 39 insertions(+), 31 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 1b21c36..4ab32a1 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -23,7 +23,7 @@ by the generated and deployed GlueGen binaries. L.1) The GlueGen source tree contains code from the JogAmp Community which is covered by the Simplified BSD 2-clause license: - Copyright 2010 JogAmp Community. All rights reserved. + Copyright 2010 - 2019 JogAmp Community. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/doc/HowToBuild.html b/doc/HowToBuild.html index daf980f..168cc27 100644 --- a/doc/HowToBuild.html +++ b/doc/HowToBuild.html @@ -69,6 +69,7 @@
  • awk
  • p7zip-full ???
  • gcc
    • +
  • cmake
    • @@ -84,12 +85,13 @@
  • gawk
  • p7zip-full
  • gcc
    • +
  • cmake
    • One liner install command: Optional: Add kernel build utilities: @@ -114,6 +116,7 @@ apt-get install lib32z1 lib32ncurses5 gcc-multilib lib32gcc1 lib32gomp1 lib32itm
  • gawk
  • p7zip-full
  • gcc
    • +
  • cmake
  • CentOS 7 / Red Hat Enterprise Linux 7.6 or later
    @@ -124,6 +127,7 @@ apt-get install lib32z1 lib32ncurses5 gcc-multilib lib32gcc1 lib32gomp1 lib32itm
  • gawk
  • p7zip-full
  • gcc
    • +
  • cmake
    • @@ -144,6 +148,7 @@ apt-get install lib32z1 lib32ncurses5 gcc-multilib lib32gcc1 lib32gomp1 lib32itm @@ -153,21 +158,19 @@ apt-get install lib32z1 lib32ncurses5 gcc-multilib lib32gcc1 lib32gomp1 lib32itm
  • Windows XP or later
  • git is provided by cygwin
  • gawk is provided by cygwin
    • -
  • MinGW64 +
  • MinGW64 (files on sourceforge)
    • +
  • CMake 3.15.2 32bit version
  • Windows/x86_64 (64-bit) @@ -175,25 +178,26 @@ apt-get install lib32z1 lib32ncurses5 gcc-multilib lib32gcc1 lib32gomp1 lib32itm
  • Windows XP or later
  • git is provided by cygwin
  • gawk is provided by cygwin
    • -
  • MinGW64 +
  • MinGW64 (files on sourceforge)
    • +
  • CMake 3.15.2 64bit version
    • +

    + CMake has been added here for JOAL and JOGL. +

    Additional platforms such as FreeBSD and HP/UX are handled by the build system, but are not officially supported. diff --git a/make/build-test.xml b/make/build-test.xml index f39f0bf..736a82a 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -579,7 +579,7 @@ chmod 644 ${results}/* \${line.separator} - + @@ -589,21 +589,21 @@ chmod 644 ${results}/* \${line.separator} - - + + + + - - @@ -620,12 +620,13 @@ chmod 644 ${results}/* \${line.separator} compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="linker.test1.fixed.cfg.id"/> + + + - - @@ -641,6 +642,9 @@ chmod 644 ${results}/* \${line.separator} compiler.cfg.id="${compiler.cfg.id}" linker.cfg.id="linker.test1.runtime.cfg.id"/> + + +