diff --git a/linux/Makefile.am b/linux/Makefile.am index 954fab16..2ff3063e 100755 --- a/linux/Makefile.am +++ b/linux/Makefile.am @@ -54,7 +54,8 @@ BUILT_SOURCES=moc/moc_server.cpp \ moc/moc_llconclientdlg.h \ moc/moc_clientsettingsdlg.h \ moc/moc_llconserverdlg.h \ - moc/moc_aboutdlg.h + moc/moc_aboutdlg.h \ + moc/resources.cpp # and should be cleaned by make clean @@ -102,4 +103,8 @@ moc/moc_llconserverdlg.h: ../src/llconserverdlgbase.ui $(QT_UIC) ../src/llconserverdlgbase.ui -o moc/llconserverdlg.h -llcon_CXXFLAGS=-I../src -I$(QTDIR)/include -DQT_THREAD_SUPPORT -D_REENTRANT -g +moc/resources.cpp: ../src/resources.qrc + $(QT_RCC) ../src/resources.qrc -o moc/resources.cpp + + +llcon_CXXFLAGS=-I../src -I$(QT_INCLUDE_DIR) -I$(EXTRA_QT_INCLUDE_DIR) -DQT_THREAD_SUPPORT -D_REENTRANT -g diff --git a/windows/MocQT.bat b/windows/MocQT.bat index 2622ee71..4b696062 100755 --- a/windows/MocQT.bat +++ b/windows/MocQT.bat @@ -46,4 +46,4 @@ rem .ui ------------- %qtdir%\bin\uic.exe ..\src\llconserverdlgbase.ui -o moc\llconserverdlgbase.h rem .qrc ------------ -%qtdir%\bin\rcc.exe ..\src\resources.qrc -o moc\resources.rcc +%qtdir%\bin\rcc.exe ..\src\resources.qrc -o moc\resources.cpp diff --git a/windows/llcon.vcproj b/windows/llcon.vcproj index 284c3290..69d37804 100755 --- a/windows/llcon.vcproj +++ b/windows/llcon.vcproj @@ -834,6 +834,10 @@ /> + +