diff --git a/mingw-w64-codelite/PKGBUILD b/mingw-w64-codelite/PKGBUILD index d7f25006e5..255fb9e322 100644 --- a/mingw-w64-codelite/PKGBUILD +++ b/mingw-w64-codelite/PKGBUILD @@ -5,7 +5,7 @@ _realname=codelite pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=6.0.1.123.gda1ca7e +pkgver=6.0.1.156.gb82f8e0 pkgrel=1 pkgdesc="Open-source, cross platform IDE for the C/C++ programming languages (mingw-w64)" arch=('any') @@ -15,29 +15,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-clang" "${MINGW_PACKAGE_PREFIX}-hunspell" "${MINGW_PACKAGE_PREFIX}-libssh" "${MINGW_PACKAGE_PREFIX}-wxWidgets" + "${MINGW_PACKAGE_PREFIX}-clang" ) makedepends=("${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-webkitgtk2" "${MINGW_PACKAGE_PREFIX}-cmake") options=(!strip staticlibs !buildflags) source=("${_realname}::git+https://github.com/eranif/codelite.git" - codelite-no-rpath-windows.patch - codelite-cmake-mingw.patch codelite-sftp-createfilew.patch - codelite-find-hunspell.patch - codelite-mingw-no-fpic.patch - codelite-astyle-mingw-w64.patch - codelite-mingw-not-monolithic-wxwidgets.patch - codelite-mingw-install.patch - codelite-mingw-windres.patch) + codelite-clang-deprecated.patch) md5sums=('SKIP' - '08799707bcd285decb0cb76d1e1439bd' - '09e373db2099467b66fafdbea234b747' 'bf9749652078c87cc1b78b3b0b48f9f7' - '848abb8dcd91c1bfa2f127862131ce3d' - '48a012c2c9e9a624660a79c44d93dee4' - '68a493c90f2bbbfa0c224746ab934d16' - '86c5febc39095744a7819be10362837e' - '5ec9bf4334d1d40c041fd44d3323cf95' - 'e4690aeab224dcac338aa2991f6c12e3') + '4bec2ac130687bd4b947b98a0d5d3fd4') pkgver() { cd "$_realname" @@ -46,15 +33,8 @@ pkgver() { prepare() { cd "$srcdir/$_realname" - patch -p1 -i ${srcdir}/codelite-no-rpath-windows.patch - patch -p1 -i ${srcdir}/codelite-cmake-mingw.patch patch -p1 -i ${srcdir}/codelite-sftp-createfilew.patch - patch -p1 -i ${srcdir}/codelite-find-hunspell.patch - patch -p1 -i ${srcdir}/codelite-mingw-no-fpic.patch - patch -p1 -i ${srcdir}/codelite-astyle-mingw-w64.patch - patch -p1 -i ${srcdir}/codelite-mingw-not-monolithic-wxwidgets.patch - patch -p1 -i ${srcdir}/codelite-mingw-install.patch - patch -p1 -i ${srcdir}/codelite-mingw-windres.patch + patch -p1 -i ${srcdir}/codelite-clang-deprecated.patch } build() { @@ -72,7 +52,7 @@ build() { -G"MSYS Makefiles" \ -DPREFIX=${pkgdir}${MINGW_PREFIX} \ -DCMAKE_BUILD_TYPE=Release \ - -DENABLE_CLANG=0 \ + -DENABLE_CLANG=1 \ -DwxWidgets_CONFIG_EXECUTABLE=${MINGW_PREFIX}/bin/wx-config \ -DwxWidgets_wxrc_EXECUTABLE=${MINGW_PREFIX}/bin/wxrc-3.0 \ . diff --git a/mingw-w64-codelite/codelite-astyle-mingw-w64.patch b/mingw-w64-codelite/codelite-astyle-mingw-w64.patch deleted file mode 100644 index 499215d27a..0000000000 --- a/mingw-w64-codelite/codelite-astyle-mingw-w64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- codelite/CodeFormatter/astyle_main.h.orig 2014-07-02 23:35:17.395600000 +0400 -+++ codelite/CodeFormatter/astyle_main.h 2014-07-02 23:35:53.993200000 +0400 -@@ -93,7 +93,7 @@ - #endif - - // for mingw BOM, UTF-16, and Unicode functions --#if defined(__MINGW32__) -+#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) - #if (__MINGW32_MAJOR_VERSION > 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 16)) - #error - Use MinGW compiler version 4 or higher - #endif diff --git a/mingw-w64-codelite/codelite-clang-deprecated.patch b/mingw-w64-codelite/codelite-clang-deprecated.patch new file mode 100644 index 0000000000..05dd9b9e5c --- /dev/null +++ b/mingw-w64-codelite/codelite-clang-deprecated.patch @@ -0,0 +1,12 @@ +--- codelite/LiteEditor/clang_pch_maker_thread.cpp.orig 2014-07-06 14:54:17.618600000 +0400 ++++ codelite/LiteEditor/clang_pch_maker_thread.cpp 2014-07-06 14:55:02.094200000 +0400 +@@ -434,8 +434,7 @@ + // First time, need to create it + unsigned flags; + if(reparse) { +- flags = CXTranslationUnit_CXXPrecompiledPreamble +- | CXTranslationUnit_CacheCompletionResults ++ flags = CXTranslationUnit_CacheCompletionResults + | CXTranslationUnit_PrecompiledPreamble + | CXTranslationUnit_Incomplete + | CXTranslationUnit_DetailedPreprocessingRecord diff --git a/mingw-w64-codelite/codelite-cmake-mingw.patch b/mingw-w64-codelite/codelite-cmake-mingw.patch deleted file mode 100644 index e03b4613cb..0000000000 --- a/mingw-w64-codelite/codelite-cmake-mingw.patch +++ /dev/null @@ -1,248 +0,0 @@ -diff -Naur --strip-trailing-cr source-orig/cmake/Modules/plugin.cmake source/cmake/Modules/plugin.cmake ---- source-orig/cmake/Modules/plugin.cmake 2014-05-06 13:12:17.732200000 +0400 -+++ source/cmake/Modules/plugin.cmake 2014-05-06 22:36:19.649000000 +0400 -@@ -19,7 +19,7 @@ - ## Windows - set( MINGW 1 ) - set( CMAKE_FIND_LIBRARY_PREFIXES lib) -- set( CMAKE_FIND_LIBRARY_SUFFIXES .a) -+ set( CMAKE_FIND_LIBRARY_SUFFIXES .a .dll.a) - find_package(wxWidgets COMPONENTS std aui propgrid stc richtext ribbon REQUIRED) - - else( NOT UNIX ) -diff -Naur --strip-trailing-cr source-orig/CMakeLists.txt source/CMakeLists.txt ---- source-orig/CMakeLists.txt 2014-05-06 13:12:14.315800000 +0400 -+++ source/CMakeLists.txt 2014-05-07 09:25:35.950800000 +0400 -@@ -52,9 +52,11 @@ - - if ( UNIX ) - execute_process(COMMAND pwd OUTPUT_VARIABLE BUILD_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE) --else ( UNIX) -+elseif(MINGW) -+ set ( BUILD_DIRECTORY ${CMAKE_BINARY_DIR} ) -+else() - set ( BUILD_DIRECTORY $ENV{CD} ) --endif ( UNIX ) -+endif() - - message( "-- BUILD_DIRECTORY is set to ${BUILD_DIRECTORY}") - -@@ -78,14 +80,14 @@ - - set( CL_WX_CONFIG wx-config ) - --if (UNIX) -+if (UNIX OR MINGW) - execute_process(COMMAND which ${CL_WX_CONFIG} OUTPUT_VARIABLE WX_TOOL OUTPUT_STRIP_TRAILING_WHITESPACE) - if (NOT WX_TOOL) - message(FATAL_ERROR - "\nNo functional wx_config script was found in your PATH.\nIs the wxWidgets development package installed?" - ) - else() -- execute_process(COMMAND ${WX_TOOL} --version OUTPUT_VARIABLE WX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) -+ execute_process(COMMAND sh ${WX_TOOL} --version OUTPUT_VARIABLE WX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) - string(SUBSTRING "${WX_VERSION}" "0" "1" wxMAJOR_VERSION) - string(SUBSTRING "${WX_VERSION}" "2" "1" wxMINOR_VERSION) - string(SUBSTRING "${WX_VERSION}" "4" "1" wxRELEASE_NUMBER) -@@ -94,16 +96,19 @@ - "\nI'm afraid your wxWidgets version is too old.\nBuilding CodeLite requires at least wxWidgets-3.0.0" - ) - endif() -+ if (MINGW) -+ add_definitions(-D__WXMSW__) -+ endif (MINGW) - endif() - message("-- wx-config used is: ${WX_TOOL}") - message("-- wxWidgets version is: ${WX_VERSION}") -- if (NOT APPLE) -+ if (NOT APPLE AND NOT MINGW) - # Is the wx we are using built on gtk2 or 3? - execute_process(COMMAND ${WX_TOOL} --selected_config OUTPUT_VARIABLE WX_GTK_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) - string(SUBSTRING "${WX_GTK_VERSION}" "3" "1" GTK_VERSION) - message("-- gtk version is: ${GTK_VERSION}") - endif() --endif (UNIX) -+endif (UNIX OR MINGW) - - ######################################## - ## Override defaults with user input -@@ -130,10 +135,15 @@ - unset(ENABLE_SFTP CACHE) - - if ( WITH_SFTP ) -- if (UNIX AND NOT APPLE ) -+ if (UNIX AND NOT APPLE OR MINGW) - ## Linux -+ if (MINGW) -+ find_library(LIBSSH_LIB NAMES ssh PATH_SUFFIXES lib) -+ find_path(LIBSSH_INCLUDE_DIR NAMES libssh.h PATH_SUFFIXES include/libssh) -+ else() - find_library(LIBSSH_LIB NAMES libssh.so HINTS /usr/local/lib /usr/lib ${CMAKE_INSTALL_LIBDIR}) - find_path(LIBSSH_INCLUDE_DIR NAMES libssh.h HINTS /usr/local/include /usr/include PATH_SUFFIXES libssh) -+ endif() - string(FIND ${LIBSSH_INCLUDE_DIR} "NOTFOUND" LIBSSH_NOT_FOUND_POS) - if ( LIBSSH_NOT_FOUND_POS GREATER -1 ) - if (UNIX AND NOT APPLE ) -@@ -146,12 +156,12 @@ - message(FATAL_ERROR "-- Could not find libssh") - endif( LIBSSH_NOT_FOUND_POS GREATER -1 ) - -- else ( UNIX AND NOT APPLE ) -+ else ( UNIX AND NOT APPLE OR MINGW ) - ## OSX - set( LIBSSH_INCLUDE_DIR ${CL_SRC_ROOT}/sdk/libssh/include) - set( LIBSSH_LIB ${CL_SRC_ROOT}/sdk/libssh/lib/osx/libssh.a) - include_directories(${LIBSSH_INCLUDE_DIR}) -- endif ( UNIX AND NOT APPLE ) -+ endif ( UNIX AND NOT APPLE OR MINGW ) - message("-- LIBSSH_LIB is set to ${LIBSSH_LIB}") - endif ( WITH_SFTP ) - -diff -Naur --strip-trailing-cr source-orig/CodeLite/CMakeLists.txt source/CodeLite/CMakeLists.txt ---- source-orig/CodeLite/CMakeLists.txt 2014-05-06 13:12:14.565400000 +0400 -+++ source/CodeLite/CMakeLists.txt 2014-05-07 09:18:02.408000000 +0400 -@@ -28,7 +28,7 @@ - set(ADDITIONAL_LIBRARIES "-ldl") - endif ( ) - else (UNIX) -- ## Windows?? -+ set(ADDITIONAL_LIBRARIES "-lws2_32") - endif (UNIX) - - ## Macros -diff -Naur --strip-trailing-cr source-orig/codelite_make/CMakeLists.txt source/codelite_make/CMakeLists.txt ---- source-orig/codelite_make/CMakeLists.txt 2014-05-06 13:12:19.838200000 +0400 -+++ source/codelite_make/CMakeLists.txt 2014-05-07 09:05:29.019600000 +0400 -@@ -20,7 +20,7 @@ - - # we need wxWidgets flags to be set only for the c++ files, so we do it like this - # by setting the CMAKE_CXX_FLAGS --execute_process(COMMAND ${CL_WX_CONFIG} --cxxflags OUTPUT_VARIABLE WX_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) -+execute_process(COMMAND sh ${CL_WX_CONFIG} --cxxflags OUTPUT_VARIABLE WX_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WX_CXX_FLAGS}") - - # prepare list of files -diff -Naur --strip-trailing-cr source-orig/codelite_terminal/CMakeLists.txt source/codelite_terminal/CMakeLists.txt ---- source-orig/codelite_terminal/CMakeLists.txt 2014-05-06 13:12:19.838200000 +0400 -+++ source/codelite_terminal/CMakeLists.txt 2014-05-07 09:06:09.751200000 +0400 -@@ -18,7 +18,7 @@ - - # we need wxWidgets flags to be set only for the c++ files, so we do it like this - # by setting the CMAKE_CXX_FLAGS --execute_process(COMMAND ${CL_WX_CONFIG} --debug=no --cxxflags OUTPUT_VARIABLE WX_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) -+execute_process(COMMAND sh ${CL_WX_CONFIG} --debug=no --cxxflags OUTPUT_VARIABLE WX_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WX_CXX_FLAGS}") - - add_definitions(-DNDEBUG) -diff -Naur --strip-trailing-cr source-orig/Plugin/CMakeLists.txt source/Plugin/CMakeLists.txt ---- source-orig/Plugin/CMakeLists.txt 2014-05-06 13:12:15.953800000 +0400 -+++ source/Plugin/CMakeLists.txt 2014-05-07 10:01:43.168200000 +0400 -@@ -59,7 +59,9 @@ - else ( ) - set(ADDITIONAL_LIBRARIES "-ldl") - endif ( ) --endif (UNIX) -+elseif (WIN32) -+ set(ADDITIONAL_LIBRARIES "-luxtheme") -+endif ( ) - - add_definitions(-DWXUSINGDLL_WXSQLITE3) - add_definitions(-DWXUSINGDLL_CL) -diff -Naur --strip-trailing-cr source-orig/sdk/codelite_cppcheck/CMakeLists.txt source/sdk/codelite_cppcheck/CMakeLists.txt ---- source-orig/sdk/codelite_cppcheck/CMakeLists.txt 2014-05-06 13:12:23.504200000 +0400 -+++ source/sdk/codelite_cppcheck/CMakeLists.txt 2014-05-07 08:08:09.334600000 +0400 -@@ -8,10 +8,16 @@ - # Include paths - include_directories("${CL_SRC_ROOT}/sdk/codelite_cppcheck/lib" "${CL_SRC_ROOT}/sdk/codelite_cppcheck/cli") - -+set( ADDITIONAL_LIBRARIES "" ) -+ - # Add RPATH - if(UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") - endif (UNIX) -+ -+if(WIN32) -+set(ADDITIONAL_LIBRARIES "-lshlwapi") -+endif(WIN32) - - include_directories("${CL_SRC_ROOT}/sdk/codelite_cppcheck/externals/tinyxml") - FILE(GLOB SRCS "cli/*.cpp" "lib/*.cpp" "externals/*/*.cpp") -@@ -21,7 +29,7 @@ - - # Define the output - add_executable(codelite_cppcheck ${SRCS}) --target_link_libraries(codelite_cppcheck ${LINKER_OPTIONS}) -+target_link_libraries(codelite_cppcheck ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES}) - - install(TARGETS codelite_cppcheck DESTINATION ${CL_PREFIX}/bin) - -diff -Naur --strip-trailing-cr source-orig/sdk/codelite_indexer/CMakeLists.txt source/sdk/codelite_indexer/CMakeLists.txt ---- source-orig/sdk/codelite_indexer/CMakeLists.txt 2014-05-06 13:12:29.369800000 +0400 -+++ source/sdk/codelite_indexer/CMakeLists.txt 2014-05-07 09:13:40.107600000 +0400 -@@ -21,14 +21,16 @@ - - # we need wxWidgets flags to be set only for the c++ files, so we do it like this - # by setting the CMAKE_CXX_FLAGS --execute_process(COMMAND ${CL_WX_CONFIG} --cxxflags OUTPUT_VARIABLE WX_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) -+execute_process(COMMAND sh ${CL_WX_CONFIG} --cxxflags OUTPUT_VARIABLE WX_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WX_CXX_FLAGS}") - - # prepare list of files - FILE(GLOB SRCS "*.cpp" "libctags/*.c" "network/*.cpp") - -+if (UNIX) - # we require this macro to be set to true - add_definitions(-DHAVE_CONFIG_H) -+endif (UNIX) - - # and finally prepare list of includes directories - include_directories("${CL_SRC_ROOT}/sdk/codelite_indexer/libctags") -diff -Naur --strip-trailing-cr source-orig/sdk/codelite_indexer/libctags/read.c source/sdk/codelite_indexer/libctags/read.c ---- source-orig/sdk/codelite_indexer/libctags/read.c 2014-05-06 13:12:29.635000000 +0400 -+++ source/sdk/codelite_indexer/libctags/read.c 2014-05-07 08:30:37.057000000 +0400 -@@ -602,7 +602,7 @@ - size_t count = 0; - long sizeToRead = -1; - --#if defined(__WXMSW__) || defined(__APPLE__)||defined(__FreeBSD__) -+#if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__) - if(location < 0) - return 0; - #else -@@ -617,7 +617,7 @@ - - memset(buffer, 0, bufferSize); - --#if defined(__WXMSW__) || defined(__APPLE__)||defined(__FreeBSD__) -+#if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__) - sizeToRead = endPos - location; - #else - sizeToRead = endPos.__pos - location.__pos; -diff -Naur --strip-trailing-cr source-orig/sdk/codelite_indexer/workerthread.h source/sdk/codelite_indexer/workerthread.h ---- source-orig/sdk/codelite_indexer/workerthread.h 2014-05-06 13:12:29.853400000 +0400 -+++ source/sdk/codelite_indexer/workerthread.h 2014-05-07 07:57:07.776600000 +0400 -@@ -1,9 +1,9 @@ - #ifndef __workerthread__ - #define __workerthread__ - -+#include "network/named_pipe.h" - #include "ethread.h" - #include "equeue.h" --#include "network/named_pipe.h" - - // --------------------------------------------- - // parsing thread ---- codelite/sdk/databaselayer/CMakeLists.txt.orig 2014-07-03 07:27:38.603000000 +0400 -+++ codelite/sdk/databaselayer/CMakeLists.txt 2014-07-03 21:47:43.582200000 +0400 -@@ -31,8 +31,8 @@ - FILE(GLOB SRCS "src/dblayer/Sqlite*.cpp" "src/dblayer/Database*.cpp" "src/dblayer/Prepared*.cpp" "src/sqlite3/*.c") - - if ( WITH_MYSQL ) -- find_library(LIBMYSQLCLIENT NAMES libmysqlclient.so) -- find_path(MYSQLCLIENT_INCLUDE NAMES mysql.h PATH_SUFFIXES mysql) -+ find_library(LIBMYSQLCLIENT NAMES mysql) -+ find_path(MYSQLCLIENT_INCLUDE NAMES mysql.h PATH_SUFFIXES mysql mariadb) - - if ( ${LIBMYSQLCLIENT} STREQUAL "LIBMYSQLCLIENT-NOTFOUND") - message( FATAL_ERROR "-- Could not locate libmysqlclient.so" ) diff --git a/mingw-w64-codelite/codelite-find-hunspell.patch b/mingw-w64-codelite/codelite-find-hunspell.patch deleted file mode 100644 index fafb642737..0000000000 --- a/mingw-w64-codelite/codelite-find-hunspell.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- codelite/SpellChecker/CMakeLists.txt.orig 2014-07-02 22:34:10.188600000 +0400 -+++ codelite/SpellChecker/CMakeLists.txt 2014-07-02 22:38:48.105000000 +0400 -@@ -1,13 +1,17 @@ - # define minimum cmake version - cmake_minimum_required(VERSION 2.6.2) - --find_library(LIBHUNSPELL -- NAMES libhunspell.so -- HINTS /usr/lib /usr/local/lib /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu) -+find_library(LIBHUNSPELL -+ NAMES hunspell -+ PATH_SUFFIXES lib) - - find_path( HUNSPELL_H - NAMES hunspell.h -- HINTS /usr/include /usr/local/include /usr/include/hunspell /usr/local/include/hunspell) -+ HINTS -+ ENV HUNSPELL_DIR -+ PATHS -+ /usr/include /usr/local/include /usr/include/hunspell /usr/local/include/hunspell -+ PATH_SUFFIXES include/hunspell include) - - if ( (LIBHUNSPELL STREQUAL "LIBHUNSPELL-NOTFOUND" OR HUNSPELL_H STREQUAL "HUNSPELL_H-NOTFOUND") AND NOT APPLE ) - message(" **") diff --git a/mingw-w64-codelite/codelite-mingw-install.patch b/mingw-w64-codelite/codelite-mingw-install.patch deleted file mode 100644 index 13c9deaca3..0000000000 --- a/mingw-w64-codelite/codelite-mingw-install.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- codelite/LiteEditor/CMakeLists.txt.orig 2014-07-03 07:23:33.998800000 +0400 -+++ codelite/LiteEditor/CMakeLists.txt 2014-07-03 07:24:44.105200000 +0400 -@@ -123,7 +123,9 @@ - install(FILES ${CL_SRC_ROOT}/Runtime/config/build_settings.xml.default DESTINATION ${CL_PREFIX}/share/codelite/config) - install(FILES ${CL_SRC_ROOT}/Runtime/config/debuggers.xml.gtk DESTINATION ${CL_PREFIX}/share/codelite/config RENAME debuggers.xml.default) - install(FILES ${CL_SRC_ROOT}/Runtime/config/codelite.xml.default.gtk DESTINATION ${CL_PREFIX}/share/codelite/config RENAME codelite.xml.default) -+if ( UNIX AND NOT APPLE ) - install(FILES ${CL_SRC_ROOT}/Runtime/codelite.desktop DESTINATION ${CL_PREFIX}/share/applications) -+endif ( UNIX AND NOT APPLE ) - - install( - DIRECTORY ${CL_SRC_ROOT}/Runtime/plugins/resources ---- codelite/CodeLite/CMakeLists.txt.orig 2014-07-03 14:04:28.247800000 +0400 -+++ codelite/CodeLite/CMakeLists.txt 2014-07-03 21:25:42.948800000 +0400 -@@ -63,5 +63,9 @@ - else (UNIX AND NOT APPLE) - target_link_libraries(libcodelite ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lsqlite3lib -lwxsqlite3 ${LIBSSH_LIB} ${ADDITIONAL_LIBRARIES} -lz -lcrypto) - endif ( UNIX AND NOT APPLE ) --install(TARGETS libcodelite DESTINATION ${PLUGINS_DIR}) - -+if (NOT MINGW) -+install(TARGETS libcodelite DESTINATION ${PLUGINS_DIR}) -+else () -+install(TARGETS libcodelite RUNTIME DESTINATION ${CL_PREFIX}/bin LIBRARY DESTINATION ${CL_PREFIX}/lib ARCHIVE DESTINATION ${CL_PREFIX}/lib) -+endif() ---- codelite/Plugin/CMakeLists.txt.orig 2014-07-03 07:27:39.305000000 +0400 -+++ codelite/Plugin/CMakeLists.txt 2014-07-03 21:36:09.192400000 +0400 -@@ -90,4 +90,8 @@ - target_link_libraries(plugin ${LINKER_OPTIONS} ${ADDITIONAL_LIBRARIES} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lwxsqlite3 -lsqlite3lib -llibcodelite) - endif() - -+if (NOT MINGW) - install(TARGETS plugin DESTINATION ${PLUGINS_DIR}) -+else () -+install(TARGETS plugin RUNTIME DESTINATION ${CL_PREFIX}/bin LIBRARY DESTINATION ${CL_PREFIX}/lib ARCHIVE DESTINATION ${CL_PREFIX}/lib) -+endif() ---- codelite/sdk/wxsqlite3/CMakeLists.txt.orig 2014-07-03 07:27:38.634200000 +0400 -+++ codelite/sdk/wxsqlite3/CMakeLists.txt 2014-07-03 21:43:20.523400000 +0400 -@@ -35,4 +35,9 @@ - # Define the output - add_library(wxsqlite3 SHARED ${SRCS}) - target_link_libraries(wxsqlite3 ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -L"${CL_LIBPATH}" -lsqlite3lib) -+ -+if (NOT MINGW) - install(TARGETS wxsqlite3 DESTINATION ${PLUGINS_DIR}) -+else () -+install(TARGETS wxsqlite3 RUNTIME DESTINATION ${CL_PREFIX}/bin LIBRARY DESTINATION ${CL_PREFIX}/lib ARCHIVE DESTINATION ${CL_PREFIX}/lib) -+endif() ---- codelite/sdk/databaselayer/CMakeLists.txt.orig 2014-07-03 07:27:38.603000000 +0400 -+++ codelite/sdk/databaselayer/CMakeLists.txt 2014-07-03 21:47:43.582200000 +0400 -@@ -53,4 +53,9 @@ - # Define the output - add_library(databaselayersqlite SHARED ${SRCS} ${MYSQL_SRCS}) - target_link_libraries(databaselayersqlite ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES}) -+ -+if (NOT MINGW) - install(TARGETS databaselayersqlite DESTINATION ${PLUGINS_DIR}) -+else () -+install(TARGETS databaselayersqlite RUNTIME DESTINATION ${CL_PREFIX}/bin LIBRARY DESTINATION ${CL_PREFIX}/lib ARCHIVE DESTINATION ${CL_PREFIX}/lib) -+endif() ---- codelite/sdk/wxshapeframework/CMakeLists.txt.orig 2014-07-03 07:27:38.603000000 +0400 -+++ codelite/sdk/wxshapeframework/CMakeLists.txt 2014-07-03 21:52:22.383800000 +0400 -@@ -34,4 +34,9 @@ - # Define the output - add_library(wxshapeframework SHARED ${SRCS}) - target_link_libraries(wxshapeframework ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES}) -+ -+if (NOT MINGW) - install(TARGETS wxshapeframework DESTINATION ${PLUGINS_DIR}) -+else () -+install(TARGETS wxshapeframework RUNTIME DESTINATION ${CL_PREFIX}/bin LIBRARY DESTINATION ${CL_PREFIX}/lib ARCHIVE DESTINATION ${CL_PREFIX}/lib) -+endif() diff --git a/mingw-w64-codelite/codelite-mingw-no-fpic.patch b/mingw-w64-codelite/codelite-mingw-no-fpic.patch deleted file mode 100644 index 5431f9f976..0000000000 --- a/mingw-w64-codelite/codelite-mingw-no-fpic.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- codelite/LiteEditor/CMakeLists.txt.orig 2014-07-02 23:15:04.589800000 +0400 -+++ codelite/LiteEditor/CMakeLists.txt 2014-07-02 23:55:48.741800000 +0400 -@@ -42,7 +42,9 @@ - endif() - - endif (UNIX AND NOT APPLE) -+if (NOT MINGW) - add_definitions(-fPIC) -+endif (NOT MINGW) - - if ( USE_PCH ) - add_definitions(-include "${CL_PCH_FILE}") ---- codelite/sqlite3/CMakeLists.txt.orig 2014-07-03 22:21:52.326200000 +0400 -+++ codelite/sqlite3/CMakeLists.txt 2014-07-03 22:28:06.970200000 +0400 -@@ -11,6 +11,8 @@ - - # Define the output - add_library(sqlite3lib STATIC ${SRCS}) -+if (UNIX) - SET_TARGET_PROPERTIES( sqlite3lib PROPERTIES COMPILE_FLAGS -fPIC) -+endif () - - #install(TARGETS sqlite3 DESTINATION ${PLUGINS_DIR}) diff --git a/mingw-w64-codelite/codelite-mingw-not-monolithic-wxwidgets.patch b/mingw-w64-codelite/codelite-mingw-not-monolithic-wxwidgets.patch deleted file mode 100644 index e024796dd7..0000000000 --- a/mingw-w64-codelite/codelite-mingw-not-monolithic-wxwidgets.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- codelite/codelite_terminal/CMakeLists.txt.orig 2014-07-03 07:17:08.901400000 +0400 -+++ codelite/codelite_terminal/CMakeLists.txt 2014-07-03 07:17:23.877400000 +0400 -@@ -5,11 +5,11 @@ - # visual studio, and in our makefiles. - project(codelite-terminal) - --if ( UNIX AND NOT APPLE ) -+if ( UNIX OR MINGW AND NOT APPLE ) - find_package(wxWidgets COMPONENTS std stc aui REQUIRED) - else ( UNIX AND NOT APPLE ) - find_package(wxWidgets REQUIRED) --endif ( UNIX AND NOT APPLE ) -+endif ( UNIX OR MINGW AND NOT APPLE ) - - # Add RPATH - if (UNIX) diff --git a/mingw-w64-codelite/codelite-mingw-windres.patch b/mingw-w64-codelite/codelite-mingw-windres.patch deleted file mode 100644 index 854b45fba5..0000000000 --- a/mingw-w64-codelite/codelite-mingw-windres.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- codelite/LiteEditor/CMakeLists.txt.orig 2014-07-03 22:22:02.622200000 +0400 -+++ codelite/LiteEditor/CMakeLists.txt 2014-07-03 22:59:50.077400000 +0400 -@@ -68,7 +68,12 @@ - FILE(GLOB SRCS "*.cpp") - - # Define the output -+if (MINGW) -+add_definitions(-DWINDRES) -+add_executable(codelite ${SRCS} code_parser.rc) -+else() - add_executable(codelite ${SRCS}) -+endif() - - set( ADDITIONAL_LIBRARIES "" ) - ---- codelite/codelite_terminal/CMakeLists.txt.orig 2014-07-03 22:22:02.450600000 +0400 -+++ codelite/codelite_terminal/CMakeLists.txt 2014-07-03 23:03:01.598000000 +0400 -@@ -27,7 +27,15 @@ - FILE(GLOB SRCS "*.cpp") - - # Define the output -+if (MINGW) -+add_definitions(-DWINDRES) -+execute_process(COMMAND sh ${CL_WX_CONFIG} --debug=no --rescomp OUTPUT_VARIABLE WX_RC_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE) -+string(REGEX REPLACE "windres" "" WX_RC_FLAGS ${WX_RC_FLAGS}) -+set (CMAKE_RC_FLAGS "${CMAKE_RC_FLAGS} ${WX_RC_FLAGS}") -+add_executable(codelite-terminal ${SRCS} win_resources.rc) -+else() - add_executable(codelite-terminal ${SRCS}) -+endif() - set ( UTIL_LIB "" ) - if ( UNIX ) - set( UTIL_LIB "-lutil") diff --git a/mingw-w64-codelite/codelite-no-rpath-windows.patch b/mingw-w64-codelite/codelite-no-rpath-windows.patch deleted file mode 100644 index 590fca1183..0000000000 --- a/mingw-w64-codelite/codelite-no-rpath-windows.patch +++ /dev/null @@ -1,525 +0,0 @@ -diff -Naur --strip-trailing-cr source-orig/abbreviation/CMakeLists.txt source/abbreviation/CMakeLists.txt ---- source-orig/abbreviation/CMakeLists.txt 2014-05-06 13:12:17.654200000 +0400 -+++ source/abbreviation/CMakeLists.txt 2014-05-07 09:01:37.673600000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/CallGraph/CMakeLists.txt source/CallGraph/CMakeLists.txt ---- source-orig/CallGraph/CMakeLists.txt 2014-05-06 13:12:14.362600000 +0400 -+++ source/CallGraph/CMakeLists.txt 2014-05-07 09:02:18.358400000 +0400 -@@ -28,7 +28,9 @@ - - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/CMakePlugin/CMakeLists.txt source/CMakePlugin/CMakeLists.txt ---- source-orig/CMakePlugin/CMakeLists.txt 2014-05-06 13:12:14.315800000 +0400 -+++ source/CMakePlugin/CMakeLists.txt 2014-05-07 09:03:17.511600000 +0400 -@@ -39,7 +39,9 @@ - endif (USE_PCH) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - # Add all CPP files - file(GLOB SRCS "*.cpp") -diff -Naur --strip-trailing-cr source-orig/CodeDesigner/CMakeLists.txt source/CodeDesigner/CMakeLists.txt ---- source-orig/CodeDesigner/CMakeLists.txt 2014-05-06 13:12:14.534200000 +0400 -+++ source/CodeDesigner/CMakeLists.txt 2014-05-07 09:03:36.559200000 +0400 -@@ -22,7 +22,9 @@ - add_definitions(-DWXUSINGDLL_SDK) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/CodeFormatter/CMakeLists.txt source/CodeFormatter/CMakeLists.txt ---- source-orig/CodeFormatter/CMakeLists.txt 2014-05-06 13:12:14.549800000 +0400 -+++ source/CodeFormatter/CMakeLists.txt 2014-05-07 09:04:01.924800000 +0400 -@@ -28,7 +28,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - ---- codelite/CodeLite/CMakeLists.txt.orig 2014-07-03 14:04:28.247800000 +0400 -+++ codelite/CodeLite/CMakeLists.txt 2014-07-03 21:25:42.948800000 +0400 -@@ -44,6 +44,7 @@ - add_definitions(-DWXUSINGDLL_WXSQLITE3) - - # Add RPATH -+if (NOT MINGW) - if ( WXC_APP ) - string( REPLACE "codelite" "wxcrafter" WXC_LIBS_DIR ${PLUGINS_DIR}) - set (LINKER_OPTIONS -Wl,-rpath,"${WXC_LIBS_DIR}:${PLUGINS_DIR}") -@@ -52,6 +53,7 @@ - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") - message( "-- libcodelite.so is using RPATH set to ${PLUGINS_DIR}") - endif ( WXC_APP ) -+endif (NOT MINGW) - FILE(GLOB SRCS "*.cpp" "../sdk/codelite_indexer/network/*.cpp" "SocketAPI/*.cpp") - - # Define the output -diff -Naur --strip-trailing-cr source-orig/codelite_clang/CMakeLists.txt source/codelite_clang/CMakeLists.txt ---- source-orig/codelite_clang/CMakeLists.txt 2014-05-06 13:12:19.526200000 +0400 -+++ source/codelite_clang/CMakeLists.txt 2014-05-07 09:05:12.998400000 +0400 -@@ -14,7 +14,9 @@ - include_directories("${CLANG_INCLUDE}") - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/codelite_make/CMakeLists.txt source/codelite_make/CMakeLists.txt ---- source-orig/codelite_make/CMakeLists.txt 2014-05-06 13:12:19.838200000 +0400 -+++ source/codelite_make/CMakeLists.txt 2014-05-07 09:05:29.019600000 +0400 -@@ -15,7 +15,9 @@ - #include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces") - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - # we need wxWidgets flags to be set only for the c++ files, so we do it like this - # by setting the CMAKE_CXX_FLAGS -diff -Naur --strip-trailing-cr source-orig/codelite_terminal/CMakeLists.txt source/codelite_terminal/CMakeLists.txt ---- source-orig/codelite_terminal/CMakeLists.txt 2014-05-06 13:12:19.838200000 +0400 -+++ source/codelite_terminal/CMakeLists.txt 2014-05-07 09:06:09.751200000 +0400 -@@ -12,7 +12,9 @@ - endif ( UNIX AND NOT APPLE ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - # we need wxWidgets flags to be set only for the c++ files, so we do it like this - # by setting the CMAKE_CXX_FLAGS -diff -Naur --strip-trailing-cr source-orig/CodeLiteDiff/CMakeLists.txt source/CodeLiteDiff/CMakeLists.txt ---- source-orig/CodeLiteDiff/CMakeLists.txt 2014-05-06 13:12:14.674600000 +0400 -+++ source/CodeLiteDiff/CMakeLists.txt 2014-05-07 09:04:43.311600000 +0400 -@@ -35,7 +35,9 @@ - endif (USE_PCH) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - # Add all CPP files - file(GLOB SRCS "*.cpp") -diff -Naur --strip-trailing-cr source-orig/codelitegcc/CMakeLists.txt source/codelitegcc/CMakeLists.txt ---- source-orig/codelitegcc/CMakeLists.txt 2014-05-06 13:12:19.885000000 +0400 -+++ source/codelitegcc/CMakeLists.txt 2014-05-07 09:04:56.665200000 +0400 -@@ -6,7 +6,9 @@ - project(codelite-cc) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/ContinuousBuild/CMakeLists.txt source/ContinuousBuild/CMakeLists.txt ---- source-orig/ContinuousBuild/CMakeLists.txt 2014-05-06 13:12:14.690200000 +0400 -+++ source/ContinuousBuild/CMakeLists.txt 2014-05-07 09:06:28.268400000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/Copyright/CMakeLists.txt source/Copyright/CMakeLists.txt ---- source-orig/Copyright/CMakeLists.txt 2014-05-06 13:12:14.705800000 +0400 -+++ source/Copyright/CMakeLists.txt 2014-05-07 09:06:44.274000000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/cppchecker/CMakeLists.txt source/cppchecker/CMakeLists.txt ---- source-orig/cppchecker/CMakeLists.txt 2014-05-06 13:12:19.931800000 +0400 -+++ source/cppchecker/CMakeLists.txt 2014-05-07 09:07:00.622800000 +0400 -@@ -22,7 +22,9 @@ - add_definitions(-DWXUSINGDLL_SDK) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/cscope/CMakeLists.txt source/cscope/CMakeLists.txt ---- source-orig/cscope/CMakeLists.txt 2014-05-06 13:12:19.963000000 +0400 -+++ source/cscope/CMakeLists.txt 2014-05-07 09:07:15.973200000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/DatabaseExplorer/CMakeLists.txt source/DatabaseExplorer/CMakeLists.txt ---- source-orig/DatabaseExplorer/CMakeLists.txt 2014-05-06 13:12:14.768200000 +0400 -+++ source/DatabaseExplorer/CMakeLists.txt 2014-05-07 09:07:40.792800000 +0400 -@@ -66,7 +66,9 @@ - add_definitions(-DWXUSINGDLL_SDK) - add_definitions(-DDBL_USE_SQLITE) - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/Debugger/CMakeLists.txt source/Debugger/CMakeLists.txt ---- source-orig/Debugger/CMakeLists.txt 2014-05-06 13:12:14.955400000 +0400 -+++ source/Debugger/CMakeLists.txt 2014-05-07 09:08:01.166400000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/ExternalTools/CMakeLists.txt source/ExternalTools/CMakeLists.txt ---- source-orig/ExternalTools/CMakeLists.txt 2014-05-06 13:12:14.971000000 +0400 -+++ source/ExternalTools/CMakeLists.txt 2014-05-07 09:08:15.159600000 +0400 -@@ -28,7 +28,9 @@ - - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/git/CMakeLists.txt source/git/CMakeLists.txt ---- source-orig/git/CMakeLists.txt 2014-05-06 13:12:20.945800000 +0400 -+++ source/git/CMakeLists.txt 2014-05-07 09:08:48.824400000 +0400 -@@ -22,7 +22,9 @@ - add_definitions(-DWXUSINGDLL_SDK) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/Gizmos/CMakeLists.txt source/Gizmos/CMakeLists.txt ---- source-orig/Gizmos/CMakeLists.txt 2014-05-06 13:12:15.049000000 +0400 -+++ source/Gizmos/CMakeLists.txt 2014-05-07 09:09:08.496000000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/LiteEditor/CMakeLists.txt source/LiteEditor/CMakeLists.txt ---- source-orig/LiteEditor/CMakeLists.txt 2014-05-06 13:12:15.158200000 +0400 -+++ source/LiteEditor/CMakeLists.txt 2014-05-07 09:09:27.418800000 +0400 -@@ -59,7 +59,9 @@ - endif( USE_CLANG ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/LLDBDebugger/CMakeLists.txt source/LLDBDebugger/CMakeLists.txt ---- source-orig/LLDBDebugger/CMakeLists.txt 2014-05-06 13:12:15.080200000 +0400 -+++ source/LLDBDebugger/CMakeLists.txt 2014-05-07 09:09:53.408400000 +0400 -@@ -134,7 +134,9 @@ - add_definitions(-DWXUSINGDLL_SDK) - - # Add RPATH -+ if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+ endif (UNIX) - - ## By default, use the sources under the current folder - FILE(GLOB PLUGIN_SRCS "*.cpp") -diff -Naur --strip-trailing-cr source-orig/LLDBDebugger/codelite-lldb/CMakeLists.txt source/LLDBDebugger/codelite-lldb/CMakeLists.txt ---- source-orig/LLDBDebugger/codelite-lldb/CMakeLists.txt 2014-05-06 13:12:15.127000000 +0400 -+++ source/LLDBDebugger/codelite-lldb/CMakeLists.txt 2014-05-07 09:10:02.534400000 +0400 -@@ -9,7 +9,9 @@ - endif ( APPLE ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRC "*.cpp") - include_directories(${CL_SRC_ROOT}/LLDBDebugger) -diff -Naur --strip-trailing-cr source-orig/MacBundler/CMakeLists.txt source/MacBundler/CMakeLists.txt ---- source-orig/MacBundler/CMakeLists.txt 2014-05-06 13:12:15.891400000 +0400 -+++ source/MacBundler/CMakeLists.txt 2014-05-07 09:10:11.816400000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/Outline/CMakeLists.txt source/Outline/CMakeLists.txt ---- source-orig/Outline/CMakeLists.txt 2014-05-06 13:12:15.922600000 +0400 -+++ source/Outline/CMakeLists.txt 2014-05-07 09:10:24.374400000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/Plugin/CMakeLists.txt source/Plugin/CMakeLists.txt ---- source-orig/Plugin/CMakeLists.txt 2014-05-06 13:12:15.953800000 +0400 -+++ source/Plugin/CMakeLists.txt 2014-05-07 10:01:43.168200000 +0400 -@@ -65,7 +59,7 @@ - add_definitions(-DWXUSINGDLL_CL) - - # Add RPATH --# Add RPATH -+if(NOT MINGW) - if ( WXC_APP ) - string( REPLACE "codelite" "wxcrafter" WXC_LIBS_DIR ${PLUGINS_DIR}) - set (LINKER_OPTIONS -Wl,-rpath,"${WXC_LIBS_DIR}:${PLUGINS_DIR}") -@@ -74,6 +76,7 @@ - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") - message( "-- libplugin.so is using RPATH set to ${PLUGINS_DIR}") - endif ( WXC_APP ) -+endif() - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/QmakePlugin/CMakeLists.txt source/QmakePlugin/CMakeLists.txt ---- source-orig/QmakePlugin/CMakeLists.txt 2014-05-06 13:12:16.390600000 +0400 -+++ source/QmakePlugin/CMakeLists.txt 2014-05-07 09:10:43.219200000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/sdk/codelite_cppcheck/CMakeLists.txt source/sdk/codelite_cppcheck/CMakeLists.txt ---- source-orig/sdk/codelite_cppcheck/CMakeLists.txt 2014-05-06 13:12:23.504200000 +0400 -+++ source/sdk/codelite_cppcheck/CMakeLists.txt 2014-05-07 08:08:09.334600000 +0400 -@@ -9,7 +9,9 @@ - include_directories("${CL_SRC_ROOT}/sdk/codelite_cppcheck/lib" "${CL_SRC_ROOT}/sdk/codelite_cppcheck/cli") - - # Add RPATH -+if(UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - include_directories("${CL_SRC_ROOT}/sdk/codelite_cppcheck/externals/tinyxml") - FILE(GLOB SRCS "cli/*.cpp" "lib/*.cpp" "externals/*/*.cpp") -diff -Naur --strip-trailing-cr source-orig/sdk/codelite_indexer/CMakeLists.txt source/sdk/codelite_indexer/CMakeLists.txt ---- source-orig/sdk/codelite_indexer/CMakeLists.txt 2014-05-06 13:12:29.369800000 +0400 -+++ source/sdk/codelite_indexer/CMakeLists.txt 2014-05-07 09:13:40.107600000 +0400 -@@ -15,7 +15,9 @@ - #include_directories("${CL_SRC_ROOT}/Plugin" "${CL_SRC_ROOT}/sdk/wxsqlite3/include" "${CL_SRC_ROOT}/CodeLite" "${CL_SRC_ROOT}/PCH" "${CL_SRC_ROOT}/Interfaces") - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - # we need wxWidgets flags to be set only for the c++ files, so we do it like this - # by setting the CMAKE_CXX_FLAGS -diff -Naur --strip-trailing-cr source-orig/sdk/databaselayer/CMakeLists.txt source/sdk/databaselayer/CMakeLists.txt ---- source-orig/sdk/databaselayer/CMakeLists.txt 2014-05-06 13:12:30.025000000 +0400 -+++ source/sdk/databaselayer/CMakeLists.txt 2014-05-07 09:11:13.561200000 +0400 -@@ -24,7 +24,10 @@ - endif(WIN32) - - # Add RPATH --SET (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+if (UNIX) -+set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) -+ - FILE(GLOB SRCS "src/dblayer/Sqlite*.cpp" "src/dblayer/Database*.cpp" "src/dblayer/Prepared*.cpp" "src/sqlite3/*.c") - - if ( WITH_MYSQL ) -diff -Naur --strip-trailing-cr source-orig/sdk/wxshapeframework/CMakeLists.txt source/sdk/wxshapeframework/CMakeLists.txt ---- source-orig/sdk/wxshapeframework/CMakeLists.txt 2014-05-06 13:12:32.585600000 +0400 -+++ source/sdk/wxshapeframework/CMakeLists.txt 2014-05-07 09:11:23.560800000 +0400 -@@ -25,7 +25,9 @@ - include_directories("${CL_SRC_ROOT}/sdk/wxshapeframework/include" "${CL_SRC_ROOT}/sdk/wxshapeframework/src") - - # Add RPATH --SET (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+if (UNIX) -+set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "src/*.cpp" "src/wxxmlserializer/*.cpp") - -diff -Naur --strip-trailing-cr source-orig/sdk/wxsqlite3/CMakeLists.txt source/sdk/wxsqlite3/CMakeLists.txt ---- source-orig/sdk/wxsqlite3/CMakeLists.txt 2014-05-06 13:12:33.642800000 +0400 -+++ source/sdk/wxsqlite3/CMakeLists.txt 2014-05-07 09:11:33.903600000 +0400 -@@ -24,7 +24,9 @@ - include_directories(./include ../../sqlite3) - - # Add RPATH --SET (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+if (UNIX) -+set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - # For convenience we define the sources as a variable. You can add - # header files and cpp/c files and CMake will sort them out -diff -Naur --strip-trailing-cr source-orig/SFTP/CMakeLists.txt source/SFTP/CMakeLists.txt ---- source-orig/SFTP/CMakeLists.txt 2014-05-06 13:12:17.233000000 +0400 -+++ source/SFTP/CMakeLists.txt 2014-05-07 09:11:43.981200000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/SnipWiz/CMakeLists.txt source/SnipWiz/CMakeLists.txt ---- source-orig/SnipWiz/CMakeLists.txt 2014-05-06 13:12:17.264200000 +0400 -+++ source/SnipWiz/CMakeLists.txt 2014-05-07 09:11:57.194400000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/Subversion2/CMakeLists.txt source/Subversion2/CMakeLists.txt ---- source-orig/Subversion2/CMakeLists.txt 2014-05-06 13:12:17.279800000 +0400 -+++ source/Subversion2/CMakeLists.txt 2014-05-07 09:12:06.960000000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/Tweaks/CMakeLists.txt source/Tweaks/CMakeLists.txt ---- source-orig/Tweaks/CMakeLists.txt 2014-05-06 13:12:17.435800000 +0400 -+++ source/Tweaks/CMakeLists.txt 2014-05-07 09:12:17.209200000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/UnitTestCPP/CMakeLists.txt source/UnitTestCPP/CMakeLists.txt ---- source-orig/UnitTestCPP/CMakeLists.txt 2014-05-06 13:12:17.576200000 +0400 -+++ source/UnitTestCPP/CMakeLists.txt 2014-05-07 09:12:27.380400000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/wxformbuilder/CMakeLists.txt source/wxformbuilder/CMakeLists.txt ---- source-orig/wxformbuilder/CMakeLists.txt 2014-05-06 13:12:34.110800000 +0400 -+++ source/wxformbuilder/CMakeLists.txt 2014-05-07 09:12:43.776000000 +0400 -@@ -27,9 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -- -- -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") - -diff -Naur --strip-trailing-cr source-orig/ZoomNavigator/CMakeLists.txt source/ZoomNavigator/CMakeLists.txt ---- source-orig/ZoomNavigator/CMakeLists.txt 2014-05-06 13:12:17.623000000 +0400 -+++ source/ZoomNavigator/CMakeLists.txt 2014-05-07 09:12:53.682000000 +0400 -@@ -27,7 +27,9 @@ - endif ( USE_PCH ) - - # Add RPATH -+if (UNIX) - set (LINKER_OPTIONS -Wl,-rpath,"${PLUGINS_DIR}") -+endif (UNIX) - - FILE(GLOB SRCS "*.cpp") -