aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--make/build-jogl.xml24
-rw-r--r--make/build-nativewindow.xml29
-rw-r--r--make/build-newt.xml39
-rw-r--r--www/dukebeanem.jpgbin4743 -> 0 bytes
-rw-r--r--www/elflight.pngbin521109 -> 0 bytes
-rw-r--r--www/elflightengine-160x122.pngbin0 -> 39384 bytes
-rw-r--r--www/index.html15
7 files changed, 83 insertions, 24 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 6c1cb8e6b..da6dacdc8 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1105,11 +1105,21 @@
<compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd">
<!-- Need to force X11R6 headers on to include path after stub_includes -->
<includepath path="stub_includes/opengl"/>
- <includepath path="/usr/X11R6/include" />
+ <includepath path="/usr/local/include" />
</compiler>
<!-- linker configuration -->
+ <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd">
+ <syslibset dir="/usr/local/lib" libs="X11"/>
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
+ </linker>
+
+ <linker id="linker.cfg.freebsd.amd64.jogl.x11" extends="linker.cfg.freebsd.amd64">
+ <syslibset dir="/usr/local/lib" libs="X11"/>
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
+ </linker>
+
<linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux">
<syslibset libs="X11"/>
<syslibset libs="Xxf86vm" />
@@ -1226,12 +1236,20 @@
<property name="linker.cfg.id.os" value="linker.cfg.solaris.amd64.jogl.x11" />
</target>
- <target name="c.configure.freebsd" depends="c.configure.x11" if="isFreeBSD">
+ <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86">
<echo message="FreeBSD" />
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" />
- <property name="linker.cfg.id.os" value="linker.cfg.linux.jogl.x11" />
+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.jogl.x11" />
</target>
+ <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64">
+ <echo message="FreeBSD" />
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" />
+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.amd64.jogl.x11" />
+ </target>
+
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
+
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
<echo message="HP-UX" />
<property name="compiler.cfg.id" value="compiler.cfg.hpux" />
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 861dc00c5..f7708d4f4 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -352,14 +352,23 @@
<target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler">
<!-- compiler configuration -->
<!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
-
<compiler id="compiler.cfg.freebsd.nativewindow" extends="compiler.cfg.freebsd">
<!-- Need to force X11R6 headers on to include path after stub_includes -->
- <includepath path="/usr/X11R6/include" />
+ <includepath path="/usr/local/include" />
</compiler>
<!-- linker configuration -->
-
+
+ <linker id="linker.cfg.freebsd.nativewindow.x11" extends="linker.cfg.freebsd">
+ <syslibset dir="/usr/local/lib" libs="X11"/>
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
+ </linker>
+
+ <linker id="linker.cfg.freebsd.amd64.nativewindow.x11" extends="linker.cfg.freebsd.amd64">
+ <syslibset dir="/usr/local/lib" libs="X11" />
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
+ </linker>
+
<linker id="linker.cfg.linux.nativewindow.x11" extends="linker.cfg.linux">
<syslibset libs="X11"/>
<syslibset libs="Xxf86vm" />
@@ -464,11 +473,19 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.solaris.amd64.nativewindow.x11" />
</target>
- <target name="c.configure.freebsd" depends="c.configure.x11" if="isFreeBSD">
- <echo message="FreeBSD" />
+ <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
+ <echo message="FreeBSD.x86" />
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" />
- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.nativewindow.x11" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.nativewindow.x11" />
+ </target>
+
+ <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
+ <echo message="FreeBSD.AMD64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" />
+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.amd64.nativewindow.x11" />
</target>
+
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" />
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
<echo message="HP-UX" />
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 27e770611..58f8d1962 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -231,14 +231,22 @@
<target name="c.configure.1" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler">
<!-- compiler configuration -->
<!-- Note that we can use the base setups in the gluegen-cpptasks for most of these -->
-
<compiler id="compiler.cfg.freebsd.newt" extends="compiler.cfg.freebsd">
- <!-- Need to force X11R6 headers on to include path after stub_includes -->
- <includepath path="/usr/X11R6/include" />
+ <includepath path="/usr/local/include" />
</compiler>
<!-- linker configuration -->
+ <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd">
+ <syslibset dir="/usr/local/lib" libs="X11"/>
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
+ </linker>
+
+ <linker id="linker.cfg.freebsd.amd64.newt.x11" extends="linker.cfg.freebsd.amd64">
+ <syslibset dir="/usr/local/lib" libs="X11"/>
+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" />
+ </linker>
+
<linker id="linker.cfg.linux.newt.broadcom_egl" extends="linker.cfg.linux">
<syslibset libs="EGL"/>
<syslibset libs="GLES_CM"/>
@@ -365,13 +373,30 @@
<property name="linker.cfg.id.oswin" value="linker.cfg.solaris.amd64.newt.x11" />
</target>
- <target name="c.configure.freebsd" depends="c.configure.x11" if="isFreeBSD">
- <echo message="FreeBSD" />
+ <target name="c.configure.freebsd.x86" if="isFreeBSDX86">
+ <echo message="FreeBSD.x86" />
<property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" />
- <property name="linker.cfg.id.core" value="linker.cfg.linux" />
- <property name="linker.cfg.id.oswin" value="linker.cfg.linux.newt.x11" />
+ <property name="linker.cfg.id.core" value="linker.cfg.freebsd" />
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.newt.x11"
+ else="linker.cfg.freebsd">
+ <isset property="isX11" />
+ </condition>
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
+ </target>
+
+ <target name="c.configure.freebsd.amd64" if="isFreeBSDAMD64">
+ <echo message="FreeBSD.AMD64" />
+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" />
+ <property name="linker.cfg.id.core" value="linker.cfg.freebsd.amd64" />
+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.amd64.newt.x11"
+ else="linker.cfg.freebsd.amd64">
+ <isset property="isX11" />
+ </condition>
+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" />
</target>
+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/>
+
<target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX">
<echo message="HP-UX" />
<property name="compiler.cfg.id" value="compiler.cfg.hpux" />
diff --git a/www/dukebeanem.jpg b/www/dukebeanem.jpg
deleted file mode 100644
index 68d3a72c6..000000000
--- a/www/dukebeanem.jpg
+++ /dev/null
Binary files differ
diff --git a/www/elflight.png b/www/elflight.png
deleted file mode 100644
index 5f5d59f9d..000000000
--- a/www/elflight.png
+++ /dev/null
Binary files differ
diff --git a/www/elflightengine-160x122.png b/www/elflightengine-160x122.png
new file mode 100644
index 000000000..92ecc12e9
--- /dev/null
+++ b/www/elflightengine-160x122.png
Binary files differ
diff --git a/www/index.html b/www/index.html
index 7cf10fe8d..21993aa69 100644
--- a/www/index.html
+++ b/www/index.html
@@ -246,14 +246,13 @@
of the <a href="http://db.cger.nies.go.jp/g3db/ggtu/trajectory.html">Global Greenhouse Gases Database</a>.
</td>
<td width="50%">
- <a href="http://www.codededge.com"><img src="elflight.png" width="160" height="95" align="left" alt="elflight engine"></img>
- The Elflight Engine</a> is a high
- performance 3D streaming game engine. It has been designed from the
- ground up for use over the World Wide Web. The streaming aspect of the
- engine allows a near "instant play" experience for the gamer. No
- massive downloads and no massive updates! The technology is
- particularly well suited to the development of MMOs and virtual
- worlds. The Elflight Engine uses JOGL to access the OpenGL API.
+ <a href="http://www.codededge.com"><img src="elflightengine-160x122.png" width="160" height="122" align="left" alt="elflight engine"></img>
+ The Elflight Engine</a> is a games engine designed for the web.
+ It supports hardware accelerated 3D games and applications in a web browser,
+ with the ability to import assets from major 3D packages such as Maya and 3D Studio.
+ The focus of the engine's architecture is minimal startup time, fast streaming, local
+ caching and collaborative real-time editing. The Elflight Engine is multi-user and so
+ lends itself to the development of virtual worlds and MMOs.
</td>
</tr>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 10:44:57 +0000