[DEVMGR]
authorGed Murphy <gedmurphy@reactos.org>
Tue, 7 Jul 2015 11:55:36 +0000 (11:55 +0000)
committerGed Murphy <gedmurphy@reactos.org>
Tue, 7 Jul 2015 11:55:36 +0000 (11:55 +0000)
- Rearrange the file structure, move the properties/resource/misc stuff to a ./properties folder
- Add a CMakeLists.txt file to combine both old and new code. Should now build with the msvc RosBe (doesn't yet run)

svn path=/trunk/; revision=68371

reactos/dll/win32/devmgr_new/CMakeLists.txt
reactos/dll/win32/devmgr_new/includes/.gitignore [new file with mode: 0644]
reactos/dll/win32/devmgr_new/properties/advprop.c [moved from reactos/dll/win32/devmgr_new/advprop.c with 100% similarity]
reactos/dll/win32/devmgr_new/properties/devprblm.c [moved from reactos/dll/win32/devmgr_new/devprblm.c with 100% similarity]
reactos/dll/win32/devmgr_new/properties/hwpage.c [moved from reactos/dll/win32/devmgr_new/hwpage.c with 100% similarity]
reactos/dll/win32/devmgr_new/properties/hwresource.c [moved from reactos/dll/win32/devmgr_new/hwresource.c with 100% similarity]
reactos/dll/win32/devmgr_new/properties/misc.c [moved from reactos/dll/win32/devmgr_new/misc.c with 100% similarity]
reactos/dll/win32/devmgr_new/properties/stubs.c [moved from reactos/dll/win32/devmgr_new/stubs.c with 100% similarity]

index 179e0ce..bdc3f79 100644 (file)
@@ -1,14 +1,24 @@
 
 spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB)
 
+set_cpp(WITH_RTTI WITH_STL)
+
+include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
+
 list(APPEND SOURCE
-    advprop.c
-    devprblm.c
-    hwpage.c
-    hwresource.c
-    misc.c
-    stubs.c
     precomp.h
+    Properties/advprop.c
+    Properties/devprblm.c
+    Properties/hwpage.c
+    Properties/hwresource.c
+    Properties/misc.c
+    Properties/stubs.c 
+    devmgmt/ClassNode.cpp
+    devmgmt/DeviceNode.cpp
+    devmgmt/DeviceView.cpp
+    devmgmt/MainWindow.cpp
+    devmgmt/Node.cpp
+    devmgmt/RootNode.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/devmgr_stubs.c)
 
 add_library(devmgr SHARED
@@ -17,7 +27,6 @@ add_library(devmgr SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/devmgr.def)
 
 set_module_type(devmgr win32dll UNICODE)
-target_link_libraries(devmgr uuid wine)
-add_importlibs(devmgr setupapi advapi32 newdev user32 version msvcrt kernel32 ntdll)
-add_pch(devmgr precomp.h SOURCE)
+target_link_libraries(devmgr uuid atlnew wine)
+add_importlibs(devmgr setupapi advapi32 newdev user32 gdi32 comctl32 version msvcrt kernel32 ole32 uxtheme ntdll)
 add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/devmgr_new/includes/.gitignore b/reactos/dll/win32/devmgr_new/includes/.gitignore
new file mode 100644 (file)
index 0000000..e69de29