installing configlets on Windows works

This commit is contained in:
SVN User
2009-12-24 01:35:32 +00:00
parent b8c0ac59ae
commit dd2cb62481
3 changed files with 9 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 2262 #define BUILD_NUM 2263
+1
View File
@@ -55,6 +55,7 @@ unix {
res_help_C.path = $$res.path/help/C res_help_C.path = $$res.path/help/C
res_help_en_US.path = $$res.path/help/en_US res_help_en_US.path = $$res.path/help/en_US
res_desktop.path = @DATADIR@/applications/ res_desktop.path = @DATADIR@/applications/
res_configlets.path = $$res.path/configlets
INSTALLS += res INSTALLS += res
INSTALLS += res_os INSTALLS += res_os
+7 -1
View File
@@ -11,6 +11,7 @@ win32 {
QMAKE_RUN_CC = echo QMAKE_RUN_CC = echo
QMAKE_RUN_CXX = echo QMAKE_RUN_CXX = echo
QMAKE_LINK = echo QMAKE_LINK = echo
QMAKE_COPY_DIR = C:\Windows\System32\xcopy /I /Y /S /Q
} }
!win32 { !win32 {
@@ -30,11 +31,16 @@ res_os.files = os/*.xml
res_platform.files = platform/*.xml res_platform.files = platform/*.xml
res_help_en_US.files = help/en_US/*.html help/en_US/*.png help/en_US/*.jpg res_help_en_US.files = help/en_US/*.html help/en_US/*.png help/en_US/*.jpg
unix { unix {
res_configlets.path = $$res.path/configlets
res_configlets.files = $$system(find configlets/* -path \'*/.svn*\' -prune -o -type d -print) res_configlets.files = $$system(find configlets/* -path \'*/.svn*\' -prune -o -type d -print)
} }
win32 {
res_configlets.files = configlets/*
# res_configlets.files = $$system(dir /B configlets)
}
INSTALLS -= target INSTALLS -= target
INSTALLS += res INSTALLS += res
INSTALLS += res_os INSTALLS += res_os