summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2010-11-07 07:42:09 +0100
committerSven Gothel <[email protected]>2010-11-07 07:42:09 +0100
commit8c2f02849562ea7b5ab52420c1aa798ae7aa0885 (patch)
treedf4c166efa6c46d881e37725ad24d7c8c47b783e /make
parent8ee9681488e814d663dda14ebfc2af515eb6c167 (diff)
Fix CG header, according to PCPP fix
Diffstat (limited to 'make')
-rw-r--r--make/build.xml1
-rwxr-xr-xmake/scripts/setenv-jogl.sh4
-rw-r--r--make/stub_includes/cg/CG/cg.h18
3 files changed, 11 insertions, 12 deletions
diff --git a/make/build.xml b/make/build.xml
index cdf7f38db..83dad980a 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -167,7 +167,6 @@
<ant antfile="build-junit.xml" target="junit.compile" inheritRefs="true" inheritAll="true"/>
</target>
- <target name="test" depends="junit.run"/>
<target name="junit.run" description="Run JUNIT tests in nativewindow, jogl and newt projects">
<ant antfile="build-junit.xml" target="junit.run" inheritRefs="true" inheritAll="true"/>
</target>
diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh
index 76fa40fc5..2b6985c74 100755
--- a/make/scripts/setenv-jogl.sh
+++ b/make/scripts/setenv-jogl.sh
@@ -57,8 +57,8 @@ GLUEGEN_OS=$GLUEGEN_BUILDDIR/obj
JUNIT_JAR=$GLUEGEN_DIR/make/lib/junit.jar
if [ -z "$ANT_PATH" ] ; then
- if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then
- ANT_PATH=/usr/share/ant
+ ANT_PATH=$(dirname `which ant`)/..
+ if [ -e $ANT_PATH/lib/ant.jar ] ; then
export ANT_PATH
echo autosetting ANT_PATH to $ANT_PATH
fi
diff --git a/make/stub_includes/cg/CG/cg.h b/make/stub_includes/cg/CG/cg.h
index 9bc366216..ef045defc 100644
--- a/make/stub_includes/cg/CG/cg.h
+++ b/make/stub_includes/cg/CG/cg.h
@@ -66,17 +66,17 @@
// Set up for either Win32 import/export/lib.
#ifndef CGDLL_API
-#ifdef WIN32
- #ifdef CGDLL_EXPORTS
- #define CGDLL_API /*__declspec(dllexport) */
- #elif defined (CG_LIB)
- #define CGDLL_API
+ #ifdef WIN32
+ #ifdef CGDLL_EXPORTS
+ #define CGDLL_API /*__declspec(dllexport) */
+ #elif defined (CG_LIB)
+ #define CGDLL_API
+ #else
+ #define CGDLL_API /* __declspec(dllimport) */
+ #endif
#else
- #define CGDLL_API __declspec(dllimport)
+ #define CGDLL_API
#endif
-#else
- #define CGDLL_API
-#endif
#endif
/*************************************************************************/