From 4c8220faf4e0be3cd33e68e82412d103ab6457e9 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 16 Aug 2011 18:33:43 +0200 Subject: removed old scripts --- Makefile | 29 ----------------------------- jocl.properties | 19 ------------------- scripts/install-ati-stream.sh | 29 ----------------------------- scripts/make.jocl.all.linux-x86.sh | 9 --------- scripts/make.jocl.all.linux-x86_64.sh | 9 --------- scripts/make.jocl.all.win32.bat | 12 ------------ scripts/make.jocl.all.win64.bat | 12 ------------ 7 files changed, 119 deletions(-) delete mode 100644 Makefile delete mode 100644 jocl.properties delete mode 100644 scripts/install-ati-stream.sh delete mode 100644 scripts/make.jocl.all.linux-x86.sh delete mode 100644 scripts/make.jocl.all.linux-x86_64.sh delete mode 100644 scripts/make.jocl.all.win32.bat delete mode 100644 scripts/make.jocl.all.win64.bat diff --git a/Makefile b/Makefile deleted file mode 100644 index 45bc54f1..00000000 --- a/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -BITS=32 - -ifeq ($(BITS),32) - CC=gcc32 - NS=win-x86 -else - BITS=64 - CC=gcc64 - NS=win-x64 -endif - -CFLAGS=-m$(BITS) -shared -c -fno-rtti -fPIC -I/usr/lib/jvm/java-6-sun/include -I../common/platform-libs/jre-include/win32 -Iresources/includes -LFLAGS=-m$(BITS) -shared -fno-rtti -fPIC -L../common/platform-libs/OpenCL/win/_x64 -lOpenCL - -SRC=gensrc/native/CLImpl_JNI.c -OBJ=build/obj/jocl/$(NS)/CLImpl_JNI.o -BIN=build/natives/jocl/$(NS)/jocl.dll - -all: $(BIN) - -$(BIN): $(OBJ) - $(CC) $(LFLAGS) $(OBJ) -o $(BIN) - -$(OBJ): $(SRC) - $(CC) $(CFLAGS) $(SRC) -o $(OBJ) - -clean: - rm -f $(BIN) $(OBJ) - diff --git a/jocl.properties b/jocl.properties deleted file mode 100644 index f6fd206a..00000000 --- a/jocl.properties +++ /dev/null @@ -1,19 +0,0 @@ -# you can place this file in ${user.home}/ to overwrite specific project build properties -# alternatively use nbproject/private/private.properties for storing private properties -# or edit nbproject/project.properties directly. - -# overwrite lib path for linking at compile time -# -# Windows ATI -# opencl.lib32.dir=C:/Program Files (x86)/ATI Stream/lib/x86 -# opencl.lib64.dir=C:/Program Files (x86)/ATI Stream/lib/x86_64 -# - doesn't work with mingw64, see below: -# -# Windows NVidia -# opencl.lib32.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32 -# opencl.lib64.dir=C:/NVIDIAComputingSDK/OpenCL/common/lib/x64 -# doesn't work with mingw64, see below: - -# Windows 64bit mingw64 must link against the OpenCL.dll, -# otherwise SIGV messages are produced. -# opencl.lib64.dir=C:/Windows/system32 diff --git a/scripts/install-ati-stream.sh b/scripts/install-ati-stream.sh deleted file mode 100644 index 94d3eca6..00000000 --- a/scripts/install-ati-stream.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# -# Here we have unpacked ati-stream-sdk-v2.1-lnx64.tgz from http://developer.amd.com/gpu/ATIStreamSDK/ -# to /opt-linux-x86_64/ and made a symbolic link to ati-stream-sdk. -# -# We also copied the file http://developer.amd.com/Downloads/icd-registration.tgz -# into ati-stream-sdk. - -SDK=/opt-linux-x86_64/ati-stream-sdk/ -ICDREG=/opt-linux-x86_64/ati-stream-sdk/icd-registration.tgz - -link(){ - if [ -e $2 ] ; then - rm -v $2 - fi - ln -v -s ${SDK}$1/$2 -} - -cd /usr/lib64/ -link lib/x86_64 libOpenCL.so -link lib/x86_64 libatiocl64.so - -cd /usr/lib32/ -link lib/x86 libOpenCL.so -link lib/x86 libatiocl32.so - -cd / -tar xzf $ICDREG diff --git a/scripts/make.jocl.all.linux-x86.sh b/scripts/make.jocl.all.linux-x86.sh deleted file mode 100644 index 9ae8b770..00000000 --- a/scripts/make.jocl.all.linux-x86.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -if [ -e ../setenv-build-jogl-x86.sh ] ; then - . ../setenv-build-jogl-x86.sh -fi - -ant \ - -Drootrel.build=build-x86 \ - $* 2>&1 | tee make.jocl.all.linux-x86.log diff --git a/scripts/make.jocl.all.linux-x86_64.sh b/scripts/make.jocl.all.linux-x86_64.sh deleted file mode 100644 index 6ca3e805..00000000 --- a/scripts/make.jocl.all.linux-x86_64.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -if [ -e ../setenv-build-jogl-x86_64.sh ] ; then - . ../setenv-build-jogl-x86_64.sh -fi - -ant \ - -Drootrel.build=build-x86_64 \ - $* 2>&1 | tee make.jocl.all.linux-x86_64.log diff --git a/scripts/make.jocl.all.win32.bat b/scripts/make.jocl.all.win32.bat deleted file mode 100644 index 619d71a7..00000000 --- a/scripts/make.jocl.all.win32.bat +++ /dev/null @@ -1,12 +0,0 @@ -set THISDIR="C:\JOGL" - -set J2RE_HOME=c:\jre1.6.0_20_x32 -set JAVA_HOME=c:\jdk1.6.0_20_x32 -set ANT_PATH=C:\apache-ant-1.8.0 - -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% - -set LIB_GEN=%THISDIR%\lib -set CLASSPATH=.;%THISDIR%\build-win32\classes - -ant -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jocl.all.win32.log 2>&1 diff --git a/scripts/make.jocl.all.win64.bat b/scripts/make.jocl.all.win64.bat deleted file mode 100644 index 7fd32e96..00000000 --- a/scripts/make.jocl.all.win64.bat +++ /dev/null @@ -1,12 +0,0 @@ -set THISDIR="C:\JOGL" - -set J2RE_HOME=c:\jre1.6.0_20_x64 -set JAVA_HOME=c:\jdk1.6.0_20_x64 -set ANT_PATH=C:\apache-ant-1.8.0 - -set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH% - -set LIB_GEN=%THISDIR%\lib -set CLASSPATH=.;%THISDIR%\build-win64\classes - -ant -Drootrel.build=build-win64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.jocl.all.win64.log 2>&1 -- cgit v1.2.3