diff --git a/make_libs.bat b/make_libs.bat index 2f95771..aa85688 100644 --- a/make_libs.bat +++ b/make_libs.bat @@ -1,3 +1,3 @@ @echo off -mkdir ../libs_build_win +mkdir ..\libs_build_win cd ../libs_build_win && cmake_mgw ../libs && make install -j8 && cd ../libs && pause diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index bf2f9d1..c63fdbd 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -1,6 +1,7 @@ project(qad) cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0017 OLD) +find_package(Qt4 REQUIRED) include(QtProject.cmake) if (LIBPROJECT) include(../SDKMacros.cmake) @@ -66,7 +67,7 @@ endmacro() macro(qad_plugin NAME _LIBS) project(qad_${NAME}_plugin) include_directories("..") - set(LIBS ${_${NAME}_LIBS} qad_${NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDESIGNER_LIBRARY} "${_LIBS}") + set(LIBS ${_${NAME}_PLUGIN_LIBS} qad_${NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDESIGNER_LIBRARY} "${_LIBS}") #message(${_${NAME}_PLUGIN_LIBS}) add_definitions(-DQT_PLUGIN) add_definitions(-DQT_NO_DEBUG)