Merge pull request #4 from proteneer/master

Use ezOptionParser and fix Makefiles

COPYING.lgpl

@@ -164,3 +164,23 @@ apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
 Library.
 
+  7. The Command Line Application uses ezOptionParser with the MIT License:
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+

Makefiles/Makefile.linux32

@@ -1,4 +1,3 @@
-POPT_DIR:=popt/linux32
 OPENCL_VENDOR:=NV
 ifeq "$(OPENCL_VENDOR)" "NV"
 OPENCL_DIR:=/usr/local/cuda
@@ -8,10 +7,9 @@ ifeq "$(OPENCL_VENDOR)" "AMD"
 OPENCL_DIR:=$(AMDAPPSDKROOT)
 OPENCL_INC:=$(OPENCL_DIR)/include
 endif
-INCLUDES:=-I$(OPENCL_INC) -I$(POPT_DIR)
+INCLUDES:=-I$(OPENCL_INC)
 DEFINES:=-DLINUX
-LIBDIRS:=-L$(POPT_DIR)
-CFLAGS:=-O2 -Wall $(DEFINES) $(INCLUDES) $(LIBDIRS)
+CFLAGS:=-O2 -Wall $(DEFINES) $(INCLUDES)
 CXX=g++
 CPP=cpp
 

Makefiles/Makefile.linux64

@@ -1,4 +1,3 @@
-POPT_DIR:=popt/linux64
 OPENCL_VENDOR:=AMD
 ifeq "$(OPENCL_VENDOR)" "NV"
 OPENCL_DIR:=/usr/local/cuda
@@ -9,9 +8,9 @@ OPENCL_DIR:=$(AMDAPPSDKROOT)
 OPENCL_INC:=$(OPENCL_DIR)/include
 OPENCL_LIB:=$(OPENCL_DIR)/lib/x86_64
 endif
-INCLUDES:=-I$(OPENCL_INC) -I$(POPT_DIR)
+INCLUDES:=-I$(OPENCL_INC)
 DEFINES:=-DLINUX
-LIBDIRS:=-L$(POPT_DIR) -L$(OPENCL_LIB)
+LIBDIRS:=-L$ -L$(OPENCL_LIB)
 CFLAGS:=-O2 -Wall $(DEFINES) $(INCLUDES) $(LIBDIRS)
 CXX=g++
 CPP=cpp
@@ -32,4 +31,4 @@ memtestCL_core.o: memtestCL_core.cpp memtestCL_core.h memtestCL_kernels.clh
 	$(CXX) -c $(CFLAGS) -o memtestCL_core.o memtestCL_core.cpp
 
 memtestCL: memtestCL_core.o memtestCL_cli.cpp
-	$(CXX) $(CFLAGS) -o memtestCL memtestCL_core.o memtestCL_cli.cpp -lpopt -lOpenCL -lpthread
+	$(CXX) $(CFLAGS) -o memtestCL memtestCL_core.o memtestCL_cli.cpp -lOpenCL -lpthread

Makefiles/Makefile.osx

@@ -1,8 +1,5 @@
-POPT_DIR:=popt/osx
 DEFINES:=-DOSX
-INCLUDES:=-I$(POPT_DIR)
-LIBDIRS:=-L$(POPT_DIR)
-CFLAGS:=-O2 -g -Wall $(DEFINES) $(INCLUDES) $(LIBDIRS) -framework OpenCL -m32
+CFLAGS:=-O2 -g -Wall $(DEFINES) -framework OpenCL -m32
 CXX=g++
 CPP=cpp
 

Makefiles/Makefile.windows

@@ -1,16 +1,15 @@
-POPT_DIR=popt/win32
-OPENCL_VENDOR=AMD # NV, NV64, AMD, AMD64
+OPENCL_VENDOR=NV # NV, NV64, AMD, AMD64
 
 !if "$(OPENCL_VENDOR)" == "NV"
-OPENCL_DIR="\CUDA"
+OPENCL_DIR="C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5"
 OPENCL_INC=$(OPENCL_DIR)\include
-OPENCL_LIB=$(OPENCL_DIR)\lib\OpenCL.lib
+OPENCL_LIB=$(OPENCL_DIR)\lib\Win32\OpenCL.lib
 !endif
 
 !if "$(OPENCL_VENDOR)" == "NV64"
 OPENCL_DIR="\CUDA"
 OPENCL_INC=$(OPENCL_DIR)\include
-OPENCL_LIB=$(OPENCL_DIR)\lib64\OpenCL.lib
+OPENCL_LIB=$(OPENCL_DIR)\lib\x64\OpenCL.lib
 !endif
 
 !if "$(OPENCL_VENDOR)" == "AMD"
@@ -25,8 +24,8 @@ OPENCL_INC=$(OPENCL_DIR)\include
 OPENCL_LIB=$(OPENCL_DIR)\lib\x86_64\OpenCL.lib
 !endif
 
-LIBS=$(OPENCL_LIB) popt\win32\libpopt.lib Ws2_32.lib 
-INCLUDES=-I$(OPENCL_INC) -I$(POPT_DIR)
+LIBS=$(OPENCL_LIB) Ws2_32.lib 
+INCLUDES=-I$(OPENCL_INC)
 DEFINES=-DWINDOWS -DCURL_STATICLIB -D_CRT_SECURE_NO_DEPRECATE
 CFLAGS=-MT -Ox -EHsc $(DEFINES) $(INCLUDES) # -MTd -Zi for debug, -MT -Ox for prod
 CXX=cl

README.md

@@ -380,4 +380,24 @@ whether future versions of the GNU Lesser General Public License shall
 apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
 Library.
+
+  7. The Command Line Application uses ezOptionParser with the MIT License:
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
 ````