Menu
▾
▴
java-game-lib-cvs — Commits to the repository will be send to this list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(134) |
Sep
(52) |
Oct
(13) |
Nov
(342) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(62) |
Mar
(158) |
Apr
(38) |
May
(70) |
Jun
(58) |
Jul
(104) |
Aug
(207) |
Sep
(83) |
Oct
(122) |
Nov
(23) |
Dec
(49) |
| 2004 |
Jan
(119) |
Feb
(132) |
Mar
(192) |
Apr
(140) |
May
(77) |
Jun
(74) |
Jul
(201) |
Aug
(63) |
Sep
(102) |
Oct
(70) |
Nov
(173) |
Dec
(78) |
| 2005 |
Jan
(174) |
Feb
(197) |
Mar
(105) |
Apr
(59) |
May
(77) |
Jun
(43) |
Jul
(21) |
Aug
(18) |
Sep
(47) |
Oct
(37) |
Nov
(74) |
Dec
(50) |
| 2006 |
Jan
(44) |
Feb
(19) |
Mar
(32) |
Apr
(24) |
May
(31) |
Jun
(55) |
Jul
(138) |
Aug
(28) |
Sep
(12) |
Oct
(41) |
Nov
(58) |
Dec
(24) |
| 2007 |
Jan
(28) |
Feb
(14) |
Mar
(10) |
Apr
(68) |
May
(30) |
Jun
(26) |
Jul
(18) |
Aug
(63) |
Sep
(19) |
Oct
(29) |
Nov
(20) |
Dec
(10) |
| 2008 |
Jan
(38) |
Feb
(7) |
Mar
(37) |
Apr
(120) |
May
(41) |
Jun
(36) |
Jul
(39) |
Aug
(24) |
Sep
(28) |
Oct
(30) |
Nov
(36) |
Dec
(75) |
| 2009 |
Jan
(46) |
Feb
(22) |
Mar
(50) |
Apr
(70) |
May
(134) |
Jun
(105) |
Jul
(75) |
Aug
(34) |
Sep
(38) |
Oct
(34) |
Nov
(19) |
Dec
(20) |
| 2010 |
Jan
(11) |
Feb
(20) |
Mar
(65) |
Apr
(83) |
May
(104) |
Jun
(73) |
Jul
(78) |
Aug
(57) |
Sep
(43) |
Oct
(35) |
Nov
(9) |
Dec
(4) |
| 2011 |
Jan
(21) |
Feb
(11) |
Mar
(18) |
Apr
(10) |
May
(18) |
Jun
(15) |
Jul
(48) |
Aug
(25) |
Sep
(17) |
Oct
(45) |
Nov
(15) |
Dec
(12) |
| 2012 |
Jan
(21) |
Feb
(9) |
Mar
(12) |
Apr
(9) |
May
(9) |
Jun
(5) |
Jul
(1) |
Aug
(10) |
Sep
(12) |
Oct
(1) |
Nov
(28) |
Dec
(5) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
1
|
2
|
3
|
4
|
|
5
|
6
|
7
(1) |
8
|
9
(7) |
10
(4) |
11
|
|
12
|
13
(1) |
14
(3) |
15
(1) |
16
(1) |
17
(2) |
18
(7) |
|
19
(14) |
20
(6) |
21
|
22
|
23
|
24
(7) |
25
(1) |
|
26
|
27
(3) |
28
|
29
|
30
|
|
|
|
From: <ma...@us...> - 2006-11-18 22:22:44
|
Revision: 2655
http://svn.sourceforge.net/java-game-lib/?rev=2655&view=rev
Author: matzon
Date: 2006-11-18 14:22:41 -0800 (Sat, 18 Nov 2006)
Log Message:
-----------
beta4
Modified Paths:
--------------
trunk/LWJGL/build.xml
trunk/LWJGL/src/java/org/lwjgl/Sys.java
trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
trunk/LWJGL/src/native/common/devil/extil.c
trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml 2006-11-18 22:03:02 UTC (rev 2654)
+++ trunk/LWJGL/build.xml 2006-11-18 22:22:41 UTC (rev 2655)
@@ -13,7 +13,7 @@
<property name="lwjgl.docs" location="doc" />
<property name="lwjgl.temp" location="temp" />
<property name="lwjgl.res" location="res" />
- <property name="lwjgl.version" value="1.0beta3" />
+ <property name="lwjgl.version" value="1.0beta4" />
<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java,org/lwjgl/opengl/SGIS*.java"/>
<!-- ================================================================== -->
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2006-11-18 22:03:02 UTC (rev 2654)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2006-11-18 22:22:41 UTC (rev 2655)
@@ -54,7 +54,7 @@
private static final String JNI_LIBRARY_NAME = "lwjgl";
/** Current version of library */
- private static final String VERSION = "1.0beta3";
+ private static final String VERSION = "1.0beta4";
/** Current version of the JNI library */
static final int JNI_VERSION = 5;
Modified: trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-11-18 22:03:02 UTC (rev 2654)
+++ trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-11-18 22:22:41 UTC (rev 2655)
@@ -53,7 +53,7 @@
private static String JNI_LIBRARY_NAME = "lwjgl-devil";
/** Version of IL */
- public static final String VERSION = "1.0beta3";
+ public static final String VERSION = "1.0beta4";
/** Current version of the JNI library */
static final int JNI_VERSION = 1;
Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-11-18 22:03:02 UTC (rev 2654)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-11-18 22:22:41 UTC (rev 2655)
@@ -193,7 +193,7 @@
private static String JNI_LIBRARY_NAME = "lwjgl-fmod3";
/** Version of FMOD */
- public static final String VERSION = "1.0beta3";
+ public static final String VERSION = "1.0beta4";
/** Current version of the JNI library */
static final int JNI_VERSION = 1;
Modified: trunk/LWJGL/src/native/common/devil/extil.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/extil.c 2006-11-18 22:03:02 UTC (rev 2654)
+++ trunk/LWJGL/src/native/common/devil/extil.c 2006-11-18 22:22:41 UTC (rev 2655)
@@ -10,9 +10,7 @@
#endif
#include "org_lwjgl_devil_ILNative.h";
-static const char* VERSION = "1.0beta3";
-
-/*
+ /*
* Class: org_lwjgl_devil_ILNative
* Method: getNativeLibraryVersion
* Signature: ()I
Modified: trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c 2006-11-18 22:03:02 UTC (rev 2654)
+++ trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c 2006-11-18 22:22:41 UTC (rev 2655)
@@ -33,8 +33,6 @@
#include "org_lwjgl_fmod3_FMOD.h"
#include "extfmod3.h"
-static const char* VERSION = "1.0beta3";
-
/*
* Class: org_lwjgl_fmod3_FMOD
* Method: getNativeLibraryVersion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-11-18 22:03:04
|
Revision: 2654
http://svn.sourceforge.net/java-game-lib/?rev=2654&view=rev
Author: matzon
Date: 2006-11-18 14:03:02 -0800 (Sat, 18 Nov 2006)
Log Message:
-----------
JNI_VERSION restructure
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
trunk/LWJGL/src/native/common/devil/extil.c
Modified: trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-11-18 21:56:31 UTC (rev 2653)
+++ trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java 2006-11-18 22:03:02 UTC (rev 2654)
@@ -54,6 +54,9 @@
/** Version of IL */
public static final String VERSION = "1.0beta3";
+
+ /** Current version of the JNI library */
+ static final int JNI_VERSION = 1;
private static void loadLibrary(final String lib_name) {
AccessController.doPrivileged(new PrivilegedAction() {
@@ -74,10 +77,10 @@
loadLibrary(JNI_LIBRARY_NAME);
// check for mismatch
- String nativeVersion = getNativeLibraryVersion();
- if (!nativeVersion.equals(VERSION)) {
+ int nativeVersion = getNativeLibraryVersion();
+ if (nativeVersion != JNI_VERSION) {
throw new LinkageError(
- "Version mismatch: jar version is '" + VERSION +
+ "Version mismatch: jar version is '" + JNI_VERSION +
"', native libary version is '" + nativeVersion + "'");
}
}
@@ -88,7 +91,7 @@
static native void resetNativeStubsIL(Class clazz);
static native void nCreateIL(String[] ilPaths) throws LWJGLException;
static native void nDestroyIL();
- private static native String getNativeLibraryVersion();
+ private static native int getNativeLibraryVersion();
static void createIL() throws LWJGLException {
String[] illPaths = LWJGLUtil.getLibraryPaths(new String[]{
Modified: trunk/LWJGL/src/native/common/devil/extil.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/extil.c 2006-11-18 21:56:31 UTC (rev 2653)
+++ trunk/LWJGL/src/native/common/devil/extil.c 2006-11-18 22:03:02 UTC (rev 2654)
@@ -8,16 +8,17 @@
#include <libgen.h>
static void* devILhandle;
#endif
+#include "org_lwjgl_devil_ILNative.h";
static const char* VERSION = "1.0beta3";
/*
* Class: org_lwjgl_devil_ILNative
* Method: getNativeLibraryVersion
- * Signature: ()Ljava/lang/String;
+ * Signature: ()I
*/
-JNIEXPORT jstring JNICALL Java_org_lwjgl_devil_ILNative_getNativeLibraryVersion(JNIEnv *env, jclass clazz) {
- return NewStringNative(env, VERSION);
+JNIEXPORT jint JNICALL Java_org_lwjgl_devil_ILNative_getNativeLibraryVersion(JNIEnv *env, jclass clazz) {
+ return org_lwjgl_devil_ILNative_JNI_VERSION;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-11-18 21:56:32
|
Revision: 2653
http://svn.sourceforge.net/java-game-lib/?rev=2653&view=rev
Author: matzon
Date: 2006-11-18 13:56:31 -0800 (Sat, 18 Nov 2006)
Log Message:
-----------
JNI_VERSION restructure
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-11-18 21:28:17 UTC (rev 2652)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java 2006-11-18 21:56:31 UTC (rev 2653)
@@ -194,6 +194,9 @@
/** Version of FMOD */
public static final String VERSION = "1.0beta3";
+
+ /** Current version of the JNI library */
+ static final int JNI_VERSION = 1;
static {
initialize();
@@ -211,10 +214,10 @@
loadLibrary(JNI_LIBRARY_NAME);
// check for mismatch
- String nativeVersion = getNativeLibraryVersion();
- if (!nativeVersion.equals(VERSION)) {
+ int nativeVersion = getNativeLibraryVersion();
+ if (nativeVersion != JNI_VERSION) {
throw new LinkageError(
- "Version mismatch: jar version is '" + VERSION +
+ "Version mismatch: jar version is '" + JNI_VERSION +
"', native libary version is '" + nativeVersion + "'");
}
@@ -242,7 +245,7 @@
/**
* Return the version of the native library
*/
- private static native String getNativeLibraryVersion();
+ private static native int getNativeLibraryVersion();
/**
* @return true if AL has been created
Modified: trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c 2006-11-18 21:28:17 UTC (rev 2652)
+++ trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c 2006-11-18 21:56:31 UTC (rev 2653)
@@ -38,10 +38,10 @@
/*
* Class: org_lwjgl_fmod3_FMOD
* Method: getNativeLibraryVersion
- * Signature: ()Ljava/lang/String;
+ * Signature: ()I
*/
-JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMOD_getNativeLibraryVersion(JNIEnv * env, jclass clazz) {
- return NewStringNative(env, VERSION);
+JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMOD_getNativeLibraryVersion(JNIEnv * env, jclass clazz) {
+ return org_lwjgl_fmod3_FMOD_JNI_VERSION;
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-11-18 21:28:18
|
Revision: 2652
http://svn.sourceforge.net/java-game-lib/?rev=2652&view=rev
Author: matzon
Date: 2006-11-18 13:28:17 -0800 (Sat, 18 Nov 2006)
Log Message:
-----------
using __APPLE__ && __MACH__ instead of _MACOSX
Modified Paths:
--------------
trunk/LWJGL/src/native/common/fmod3/extfmod3.h
trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c
Modified: trunk/LWJGL/src/native/common/fmod3/extfmod3.h
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/extfmod3.h 2006-11-18 21:20:41 UTC (rev 2651)
+++ trunk/LWJGL/src/native/common/fmod3/extfmod3.h 2006-11-18 21:28:17 UTC (rev 2652)
@@ -36,10 +36,10 @@
#include <jni.h>
#include "../common_tools.h"
-#ifdef _MACOSX
-#include "fmoddyn_mac.h"
+#ifdef __APPLE__ && __MACH__
+ #include "fmoddyn_mac.h"
#else
-#include "fmoddyn.h"
+ #include "fmoddyn.h"
#endif
#include "fmod_errors.h"
Modified: trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c 2006-11-18 21:20:41 UTC (rev 2651)
+++ trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c 2006-11-18 21:28:17 UTC (rev 2652)
@@ -1391,7 +1391,7 @@
* Signature: (C)Z
*/
JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1CD_1OpenTray(JNIEnv * env, jclass clazz, jchar drive, jboolean open) {
-#ifdef _MACOSX
+#ifdef __APPLE__ && __MACH__
return false;
#else
return fmod_instance->FSOUND_CD_OpenTray(drive, open);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-11-18 21:20:44
|
Revision: 2651
http://svn.sourceforge.net/java-game-lib/?rev=2651&view=rev
Author: matzon
Date: 2006-11-18 13:20:41 -0800 (Sat, 18 Nov 2006)
Log Message:
-----------
universal build of fmod
Added Paths:
-----------
trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml
Added: trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml (rev 0)
+++ trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml 2006-11-18 21:20:41 UTC (rev 2651)
@@ -0,0 +1,86 @@
+<?xml version="1.0" ?>
+<project name="OS X Native code" basedir="../../bin/fmod3" default="nativelibrary">
+ <property environment="env"/>
+ <property name="native" location="../../src/native"/>
+ <property name="fmod.home" location="${env.FMOD}"/>
+
+
+ <target name="init">
+ <mkdir dir="ppc"/>
+ <mkdir dir="intel"/>
+ </target>
+
+ <target name="clean">
+ <delete failonerror="false">
+ <fileset dir="intel"/>
+ <fileset dir="ppc"/>
+ <fileset dir="." includes="liblwjgl-fmod3.jnilib"/>
+ <fileset dir="." includes="fmod3.symbols"/>
+ </delete>
+ </target>
+
+ <target name="compile">
+ <apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
+ <arg line="${cflags} -O2 -Wall -c -fno-common -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${fmod.home}/api/inc"/>
+ <!-- Map from *.m and *.c to .o -->
+ <mapper type="regexp" from="^(.*)\.(c)" to="\1.o"/>
+ <fileset dir="${native}/common" includes="common_tools.c"/>
+ <fileset dir="${native}/common/fmod3" includes="*.c"/>
+ </apply>
+ </target>
+
+ <target name="link">
+ <apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
+ <arg line="${linkerflags} -single_module -exported_symbols_list ../fmod3.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon ${staticlibs}"/>
+ <fileset dir="${objdir}" includes="*.o"/>
+ </apply>
+ <apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
+ <arg line="-S -X"/>
+ <fileset dir="." file="${libname}"/>
+ </apply>
+ </target>
+
+ <target name="nativelibrary" depends="init">
+ <property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
+ <property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
+ <property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/>
+ <property name="legacy_flags" value="-arch ppc"/>
+ <antcall target="compile">
+ <param name="dstdir" location="intel"/>
+ <param name="compiler" value="gcc-4.0"/>
+ <param name="sdkroot" location="${universal_sdkroot}"/>
+ <param name="cflags" value="${universal_flags}"/>
+ </antcall>
+ <antcall target="compile">
+ <param name="dstdir" location="ppc"/>
+ <param name="compiler" value="gcc-3.3"/>
+ <param name="sdkroot" location="${legacy_sdkroot}"/>
+ <param name="cflags" value="${legacy_flags}"/>
+ </antcall>
+ <exec vmlauncher="false" executable="../../platform_build/macosx_ant/build-symbol-list" output="fmod3.symbols" failonerror="true">
+ <arg path="intel"/>
+ </exec>
+ <antcall target="link">
+ <param name="objdir" location="intel"/>
+ <param name="libname" value="liblwjgl-fmod3-intel.jnilib"/>
+ <param name="linker" value="gcc-4.0"/>
+ <param name="linkerflags" value="${universal_flags}"/>
+ <param name="staticlibs" value="${fmod.home}/api/lib/libfmodx86.a"/>
+ </antcall>
+ <antcall target="link">
+ <param name="objdir" location="ppc"/>
+ <param name="libname" value="liblwjgl-fmod3-ppc.jnilib"/>
+ <param name="linker" value="gcc-3.3"/>
+ <param name="linkerflags" value="${legacy_flags}"/>
+ <param name="staticlibs" value="${fmod.home}/api/lib/libfmod.a"/>
+ </antcall>
+ <apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
+ <arg value="-create"/>
+ <srcfile/>
+ <arg value="-output"/>
+ <arg path="liblwjgl-fmod3.jnilib"/>
+ <fileset file="ppc/liblwjgl-fmod3-ppc.jnilib"/>
+ <fileset file="intel/liblwjgl-fmod3-intel.jnilib"/>
+ </apply>
+ </target>
+</project>
Property changes on: trunk/LWJGL/platform_build/macosx_ant/build_fmod3.xml
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-11-18 18:40:40
|
Revision: 2650
http://svn.sourceforge.net/java-game-lib/?rev=2650&view=rev
Author: matzon
Date: 2006-11-18 10:40:39 -0800 (Sat, 18 Nov 2006)
Log Message:
-----------
devil universal build script
Added Paths:
-----------
trunk/LWJGL/platform_build/macosx_ant/build_devil.xml
Added: trunk/LWJGL/platform_build/macosx_ant/build_devil.xml
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build_devil.xml (rev 0)
+++ trunk/LWJGL/platform_build/macosx_ant/build_devil.xml 2006-11-18 18:40:39 UTC (rev 2650)
@@ -0,0 +1,81 @@
+<?xml version="1.0" ?>
+<project name="OS X Native code" basedir="../../bin/devil" default="nativelibrary">
+ <property name="native" location="../../src/native"/>
+
+ <target name="init">
+ <mkdir dir="ppc"/>
+ <mkdir dir="intel"/>
+ </target>
+
+ <target name="clean">
+ <delete failonerror="false">
+ <fileset dir="intel"/>
+ <fileset dir="ppc"/>
+ <fileset dir="." includes="liblwjgl-devil.jnilib"/>
+ <fileset dir="." includes="devil.symbols"/>
+ </delete>
+ </target>
+
+ <target name="compile">
+ <apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
+ <arg line="${cflags} -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common"/>
+ <!-- Map from *.m and *.c to .o -->
+ <mapper type="regexp" from="^(.*)\.(c)" to="\1.o"/>
+ <fileset dir="${native}/common" includes="common_tools.c"/>
+ <fileset dir="${native}/common/devil" includes="*.c"/>
+ </apply>
+ </target>
+
+ <target name="link">
+ <apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
+ <arg line="${linkerflags} -exported_symbols_list ../devil.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon"/>
+ <fileset dir="${objdir}" includes="*.o"/>
+ </apply>
+ <apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
+ <arg line="-S -X"/>
+ <fileset dir="." file="${libname}"/>
+ </apply>
+ </target>
+
+ <target name="nativelibrary" depends="init">
+ <property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
+ <property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
+ <property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/>
+ <property name="legacy_flags" value="-arch ppc"/>
+ <antcall target="compile">
+ <param name="dstdir" location="intel"/>
+ <param name="compiler" value="gcc-4.0"/>
+ <param name="sdkroot" location="${universal_sdkroot}"/>
+ <param name="cflags" value="${universal_flags}"/>
+ </antcall>
+ <antcall target="compile">
+ <param name="dstdir" location="ppc"/>
+ <param name="compiler" value="gcc-3.3"/>
+ <param name="sdkroot" location="${legacy_sdkroot}"/>
+ <param name="cflags" value="${legacy_flags}"/>
+ </antcall>
+ <exec vmlauncher="false" executable="../../platform_build/macosx_ant/build-symbol-list" output="devil.symbols" failonerror="true">
+ <arg path="intel"/>
+ </exec>
+ <antcall target="link">
+ <param name="objdir" location="intel"/>
+ <param name="libname" value="liblwjgl-devil-intel.jnilib"/>
+ <param name="linker" value="gcc-4.0"/>
+ <param name="linkerflags" value="${universal_flags}"/>
+ </antcall>
+ <antcall target="link">
+ <param name="objdir" location="ppc"/>
+ <param name="libname" value="liblwjgl-devil-ppc.jnilib"/>
+ <param name="linker" value="gcc-3.3"/>
+ <param name="linkerflags" value="${legacy_flags}"/>
+ </antcall>
+ <apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
+ <arg value="-create"/>
+ <srcfile/>
+ <arg value="-output"/>
+ <arg path="liblwjgl-devil.jnilib"/>
+ <fileset file="ppc/liblwjgl-devil-ppc.jnilib"/>
+ <fileset file="intel/liblwjgl-devil-intel.jnilib"/>
+ </apply>
+ </target>
+</project>
Property changes on: trunk/LWJGL/platform_build/macosx_ant/build_devil.xml
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2006-11-18 18:39:29
|
Revision: 2649
http://svn.sourceforge.net/java-game-lib/?rev=2649&view=rev
Author: matzon
Date: 2006-11-18 10:39:26 -0800 (Sat, 18 Nov 2006)
Log Message:
-----------
fixed relative path issues when dlopen is being called
Modified Paths:
--------------
trunk/LWJGL/src/native/common/devil/extil.c
trunk/LWJGL/src/native/common/devil/extilu.c
trunk/LWJGL/src/native/common/devil/extilut.c
Modified: trunk/LWJGL/src/native/common/devil/extil.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/extil.c 2006-11-17 08:08:21 UTC (rev 2648)
+++ trunk/LWJGL/src/native/common/devil/extil.c 2006-11-18 18:39:26 UTC (rev 2649)
@@ -5,6 +5,7 @@
#else
#include <dlfcn.h>
#include "extil.h"
+ #include <libgen.h>
static void* devILhandle;
#endif
@@ -69,10 +70,18 @@
#ifdef _WIN32
devILhandle = LoadLibrary(path_str);
#else
- devILhandle = dlopen(path_str, RTLD_LAZY);
+ char* directoryName = dirname(path_str);
+ char* fileName = basename(path_str);
+ char* currentDirectory = getwd(NULL);
+ if(directoryName != NULL) {
+ chdir(directoryName);
+ }
+ devILhandle = dlopen(fileName, RTLD_LAZY);
if(devILhandle == NULL) {
- printfDebug("dlopen failure: %s", dlerror());
+ printfDebug("dlopen failure: %s\n\n\n", dlerror());
}
+ chdir(currentDirectory);
+ free(currentDirectory);
#endif
if (devILhandle != NULL) {
printfDebug("Found devil at '%s'\n", path_str);
Modified: trunk/LWJGL/src/native/common/devil/extilu.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/extilu.c 2006-11-17 08:08:21 UTC (rev 2648)
+++ trunk/LWJGL/src/native/common/devil/extilu.c 2006-11-18 18:39:26 UTC (rev 2649)
@@ -5,6 +5,7 @@
#else
#include <dlfcn.h>
#include "extilu.h"
+ #include <libgen.h>
static void* devILUhandle;
#endif
@@ -58,10 +59,18 @@
#ifdef _WIN32
devILUhandle = LoadLibrary(path_str);
#else
- devILUhandle = dlopen(path_str, RTLD_LAZY);
+ char* directoryName = dirname(path_str);
+ char* fileName = basename(path_str);
+ char* currentDirectory = getwd(NULL);
+ if(directoryName != NULL) {
+ chdir(directoryName);
+ }
+ devILUhandle = dlopen(fileName, RTLD_LAZY);
if(devILUhandle == NULL) {
- printfDebug("dlopen failure: %s", dlerror());
+ printfDebug("dlopen failure: %s\n\n\n", dlerror());
}
+ chdir(currentDirectory);
+ free(currentDirectory);
#endif
if (devILUhandle != NULL) {
printfDebug("Found ilu at '%s'\n", path_str);
Modified: trunk/LWJGL/src/native/common/devil/extilut.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/extilut.c 2006-11-17 08:08:21 UTC (rev 2648)
+++ trunk/LWJGL/src/native/common/devil/extilut.c 2006-11-18 18:39:26 UTC (rev 2649)
@@ -5,6 +5,7 @@
#else
#include <dlfcn.h>
#include "extilut.h"
+ #include <libgen.h>
static void* devILUThandle;
#endif
@@ -58,10 +59,18 @@
#ifdef _WIN32
devILUThandle = LoadLibrary(path_str);
#else
- devILUThandle = dlopen(path_str, RTLD_LAZY);
+ char* directoryName = dirname(path_str);
+ char* fileName = basename(path_str);
+ char* currentDirectory = getwd(NULL);
+ if(directoryName != NULL) {
+ chdir(directoryName);
+ }
+ devILUThandle = dlopen(fileName, RTLD_LAZY);
if(devILUThandle == NULL) {
- printfDebug("dlopen failure: %s", dlerror());
+ printfDebug("dlopen failure: %s\n\n\n", dlerror());
}
+ chdir(currentDirectory);
+ free(currentDirectory);
#endif
if (devILUThandle != NULL) {
printfDebug("Found ilut at '%s'\n", path_str);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
