A couple of changes to the cmake build system.

First:  Added a DESTDIR option for package building.
Second:  Change the OpenCL setup.  On both linux and windows use CLRun.  I completely removed the option here.  If CLRun works on MacOSX this should be done there as well, and this change implemented in the scons build also.  Then we could remove the HAVE_OPENCL and the new USE_CLRUN definitions.  Then we will finally have the dynamic detection of opencl set up cross platform.
On a side note, it doesn't seem that the program loaded from TextureDecoder.cl compiles or runs.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6366 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-11-10 01:59:53 +00:00
parent 7dd7bd2b03
commit 7b34def0fc
8 changed files with 23 additions and 26 deletions

View File

@ -21,7 +21,7 @@
#include "Common.h"
#include "Timer.h"
#ifdef _WIN32
#if defined(_WIN32) || defined(USE_CLRUN)
#include "clrun.h"
#endif
@ -46,7 +46,7 @@ bool Initialize()
return false;
int err; // error code returned from api calls
#ifdef _WIN32
#if defined(_WIN32) || defined(USE_CLRUN)
clrInit();
if(!clrHasOpenCL())
return false;

View File

@ -22,7 +22,7 @@
// OpenCL on Windows is linked through the CLRun library
// It provides the headers and all the imports
#ifdef _WIN32
#if defined(_WIN32) || defined(USE_CLRUN)
#define HAVE_OPENCL 1
#endif

View File

@ -77,9 +77,9 @@ if(wxWidgets_FOUND)
add_library(memcard STATIC ${MEMCARDSRCS})
add_executable(${EXEGUI} ${SRCS})
target_link_libraries(${EXEGUI} ${LIBS} ${WXLIBS})
install(TARGETS ${EXEGUI} RUNTIME DESTINATION ${bindir})
install(TARGETS ${EXEGUI} RUNTIME DESTINATION ${DESTDIR}${bindir})
else()
add_executable(${EXENOGUI} ${SRCS})
target_link_libraries(${EXENOGUI} ${LIBS})
install(TARGETS ${EXENOGUI} RUNTIME DESTINATION ${bindir})
install(TARGETS ${EXENOGUI} RUNTIME DESTINATION ${DESTDIR}${bindir})
endif()