From 38dd8fce5f984732b96417e17057ff9e9726f202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Sat, 25 Sep 2010 15:31:18 +0000 Subject: [PATCH] [CMAKE] - improve cacls build file - add charmap, dbgprint, doskey, find, hostname, lodctr, more, reg and xcopy build files - add win32cui module type to msc toolchain find is commented out for now. svn path=/branches/cmake-bringup/; revision=48875 --- base/applications/CMakeLists.txt | 4 ++-- base/applications/cacls/CMakeLists.txt | 4 ++-- base/applications/charmap/CMakeLists.txt | 19 ++++++++++++++++++ base/applications/cmdutils/CMakeLists.txt | 15 +++++++------- .../cmdutils/dbgprint/CMakeLists.txt | 7 +++++++ .../cmdutils/doskey/CMakeLists.txt | 9 +++++++++ .../applications/cmdutils/find/CMakeLists.txt | 9 +++++++++ .../cmdutils/hostname/CMakeLists.txt | 9 +++++++++ .../cmdutils/lodctr/CMakeLists.txt | 7 +++++++ .../applications/cmdutils/more/CMakeLists.txt | 9 +++++++++ base/applications/cmdutils/reg/CMakeLists.txt | 11 ++++++++++ .../cmdutils/xcopy/CMakeLists.txt | 11 ++++++++++ importlibs/libloadperf.a | Bin 0 -> 12926 bytes msc.cmake | 4 ++++ 14 files changed, 106 insertions(+), 12 deletions(-) create mode 100644 base/applications/charmap/CMakeLists.txt create mode 100644 base/applications/cmdutils/dbgprint/CMakeLists.txt create mode 100644 base/applications/cmdutils/doskey/CMakeLists.txt create mode 100644 base/applications/cmdutils/find/CMakeLists.txt create mode 100644 base/applications/cmdutils/hostname/CMakeLists.txt create mode 100644 base/applications/cmdutils/lodctr/CMakeLists.txt create mode 100644 base/applications/cmdutils/more/CMakeLists.txt create mode 100644 base/applications/cmdutils/reg/CMakeLists.txt create mode 100644 base/applications/cmdutils/xcopy/CMakeLists.txt create mode 100644 importlibs/libloadperf.a diff --git a/base/applications/CMakeLists.txt b/base/applications/CMakeLists.txt index 5db98b4c3af..38b3f41e775 100644 --- a/base/applications/CMakeLists.txt +++ b/base/applications/CMakeLists.txt @@ -1,8 +1,8 @@ add_subdirectory(cacls) add_subdirectory(calc) -#add_subdirectory(charmap) -#add_subdirectory(cmdutils) +add_subdirectory(charmap) +add_subdirectory(cmdutils) #add_subdirectory(control) #add_subdirectory(dxdiag) #add_subdirectory(extrac32) diff --git a/base/applications/cacls/CMakeLists.txt b/base/applications/cacls/CMakeLists.txt index 0358e34a2c5..9b7f17e0178 100644 --- a/base/applications/cacls/CMakeLists.txt +++ b/base/applications/cacls/CMakeLists.txt @@ -1,12 +1,12 @@ -add_definitions(-DUNICODE -D_UNICODE) - add_executable(cacls cacls.c cacls.rc) set_module_type(cacls win32cui) +set_unicode(cacls yes) + add_importlibs(cacls advapi32 ntdll user32 shell32 msvcrt) add_dependencies(cacls psdk) diff --git a/base/applications/charmap/CMakeLists.txt b/base/applications/charmap/CMakeLists.txt new file mode 100644 index 00000000000..e6f22532fc5 --- /dev/null +++ b/base/applications/charmap/CMakeLists.txt @@ -0,0 +1,19 @@ + +list(APPEND SOURCE + about.c + charmap.c + lrgcell.c + map.c + charmap.rc) + +add_executable(charmap + ${CMAKE_CURRENT_BINARY_DIR}/charmap_precomp.h.gch + ${SOURCE}) + +add_pch(charmap ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +set_unicode(charmap yes) + +set_module_type(charmap win32gui) + +add_importlibs(charmap user32 gdi32 comctl32 msvcrt) \ No newline at end of file diff --git a/base/applications/cmdutils/CMakeLists.txt b/base/applications/cmdutils/CMakeLists.txt index 60cad46f634..4b218c3ee21 100644 --- a/base/applications/cmdutils/CMakeLists.txt +++ b/base/applications/cmdutils/CMakeLists.txt @@ -1,9 +1,8 @@ - -#add_subdirectory(dbgprint) -#add_subdirectory(doskey) +add_subdirectory(dbgprint) +add_subdirectory(doskey) #add_subdirectory(find) -#add_subdirectory(hostname) -#add_subdirectory(lodctr) -#add_subdirectory(more) -#add_subdirectory(reg) -#add_subdirectory(xcopy) +add_subdirectory(hostname) +add_subdirectory(lodctr) +add_subdirectory(more) +add_subdirectory(reg) +add_subdirectory(xcopy) diff --git a/base/applications/cmdutils/dbgprint/CMakeLists.txt b/base/applications/cmdutils/dbgprint/CMakeLists.txt new file mode 100644 index 00000000000..aef0a8b84d5 --- /dev/null +++ b/base/applications/cmdutils/dbgprint/CMakeLists.txt @@ -0,0 +1,7 @@ +add_executable(dbgprint dbgprint.c) + +set_module_type(dbgprint win32cui) + +set_unicode(dbgprint no) + +add_importlibs(dbgprint msvcrt) \ No newline at end of file diff --git a/base/applications/cmdutils/doskey/CMakeLists.txt b/base/applications/cmdutils/doskey/CMakeLists.txt new file mode 100644 index 00000000000..4bedb267745 --- /dev/null +++ b/base/applications/cmdutils/doskey/CMakeLists.txt @@ -0,0 +1,9 @@ +add_executable(doskey + doskey.c + doskey.rc) + +set_module_type(doskey win32cui) + +set_unicode(doskey yes) + +add_importlibs(doskey user32 msvcrt) \ No newline at end of file diff --git a/base/applications/cmdutils/find/CMakeLists.txt b/base/applications/cmdutils/find/CMakeLists.txt new file mode 100644 index 00000000000..c5e5e12c21c --- /dev/null +++ b/base/applications/cmdutils/find/CMakeLists.txt @@ -0,0 +1,9 @@ +add_executable(find + find.c + find.rc) + +set_module_type(find win32cui) + +set_unicode(find no) + +add_importlibs(find user32 msvcrt) \ No newline at end of file diff --git a/base/applications/cmdutils/hostname/CMakeLists.txt b/base/applications/cmdutils/hostname/CMakeLists.txt new file mode 100644 index 00000000000..80f4d8d9f7e --- /dev/null +++ b/base/applications/cmdutils/hostname/CMakeLists.txt @@ -0,0 +1,9 @@ +add_executable(hostname + hostname.c + hostname.rc) + +set_module_type(hostname win32cui) + +set_unicode(hostname no) + +add_importlibs(hostname msvcrt) \ No newline at end of file diff --git a/base/applications/cmdutils/lodctr/CMakeLists.txt b/base/applications/cmdutils/lodctr/CMakeLists.txt new file mode 100644 index 00000000000..b287b6c0cf3 --- /dev/null +++ b/base/applications/cmdutils/lodctr/CMakeLists.txt @@ -0,0 +1,7 @@ +add_executable(lodctr lodctr_main.c) + +set_module_type(lodctr win32cui) + +set_unicode(lodctr yes) + +add_importlibs(lodctr loadperf msvcrt) \ No newline at end of file diff --git a/base/applications/cmdutils/more/CMakeLists.txt b/base/applications/cmdutils/more/CMakeLists.txt new file mode 100644 index 00000000000..e16407344d7 --- /dev/null +++ b/base/applications/cmdutils/more/CMakeLists.txt @@ -0,0 +1,9 @@ +add_executable(more + more.c + more.rc) + +set_module_type(more win32cui) + +set_unicode(more no) + +add_importlibs(more ntdll user32 msvcrt) \ No newline at end of file diff --git a/base/applications/cmdutils/reg/CMakeLists.txt b/base/applications/cmdutils/reg/CMakeLists.txt new file mode 100644 index 00000000000..11555609ae2 --- /dev/null +++ b/base/applications/cmdutils/reg/CMakeLists.txt @@ -0,0 +1,11 @@ +add_definitions(-D_WIN32_WINNT=0x600) + +add_executable(reg + reg.c + rsrc.rc) + +set_module_type(reg win32cui) + +set_unicode(reg yes) + +add_importlibs(reg advapi32 user32 msvcrt) \ No newline at end of file diff --git a/base/applications/cmdutils/xcopy/CMakeLists.txt b/base/applications/cmdutils/xcopy/CMakeLists.txt new file mode 100644 index 00000000000..895a26e49a1 --- /dev/null +++ b/base/applications/cmdutils/xcopy/CMakeLists.txt @@ -0,0 +1,11 @@ +add_executable(xcopy + xcopy.c + rsrc.rc) + +set_module_type(xcopy win32cui) + +set_unicode(xcopy yes) + +add_importlibs(xcopy shell32 user32 msvcrt) + +target_link_libraries(xcopy wine) \ No newline at end of file diff --git a/importlibs/libloadperf.a b/importlibs/libloadperf.a new file mode 100644 index 0000000000000000000000000000000000000000..c8de1f8199e8d9a2fe5db3eb672bd6b47ef68478 GIT binary patch literal 12926 zcmeHN&u`l{6n?hzt67Q-#Re2x(WzV3VL;)?aiTatG1yxXY(O>)O$zTYOmSj4cB9y- zt+eZ~4L$6zV-Gv@wDbOq9(UZIvs1hGNQt5?Qj(Q4fDscWC6k{>@$uuQM^U%#Hu?wc z&lgvW;ZRzwtd}ioW6d-S{9%w&!zh{SYy676MF6-7FtZOZ_X^<3e>^Vz3qbMhzj?g& z7XZcg{^aqx3qbLMdpzD;!)h?zy3OPAbpVQ=F7Wsn)=TluKRm9y09bip+r9mVcBfpi z?56A5PdeT5s_pg~%@e2Jvfa+UIB(dUZsXVi+ip9JX8Oy(esI!kc+PiN;kQ`9R>yS) zb*!dyd}3?L6j#(@uE4SfUAj?f2lZ-2T$}`ptEZN(9tPWS zyd9_ixO3pt2D|;!f#)@P_npJe!0SKV>i3Sxz@n{q%yt@^ zC4ltBlD!f@RQye^MR)&oci=T#*J=9Z6FrH?#FPpv#$)`3i9+{Ww_Yu+2BcAy4CmFf zXkPL~`e(5w1fOE~7&6FoTB~ye~Ph`Z#Vq z$S2%_9=8$T-ocY41uiIeeNii-&QV^mh4aKOeDxaOFxP4v1sQ(6Y%8j|Fj7CkWIN?` z7|BKj9Y(Sb^|_FvbU64nWVV^bq8JRb3yppucXhZD|6fo$Ve(*MI{veOxY<^4v%ER{ zybHLwVU{A?w9uwBcEkqR-YiRzyg_cR2F<<8?gpQ){&>@vskj;7<)efXT$js(bHWAZ zqsJx8m z{GKCRXW)Rfbfnn^AcTVD9AY}Yhmzi#@tvSWV*bE1%~F}uKT(yf4T<^lbmQ<04NuOW ziuvfY!5u9B-e({k-XQaZijrN|u(5rqT?o}%7@Kev#JFmlU_RmQBIdCgN3z2LI;v3h zF@6>vjF+!Jp?}Yxhj{>3LE#_PIUlG!;t%@J7`dJ4zkC+qepJIjeyTCW2A_}2Qq)Qz z$O+Xr$YH%7VlnF{-2-PmT~C2J%vtpzeTNqW7<3B!1Ek$U}5YBx@= zJvA<(*T1Q8LX-@g8&w}e^MnVrUcUu#tLi$_yGhk;_ISe1hq}ET7z2-a_!ZN0dpVJv z_2!iIG%TF3dNn^!)-T4gzIM4;FTEOy(*_R9s`ch(O4d((bDA8ZvqNb8IKKH6P`s&%YKrXcAs<|KZ#+1zRKcj)?d&K zNZL=@<*owb$wlrb{V25?x1ZEj<09{3`f8lu`!$>kY1gcI82