[VGAFONTEDIT]

- Fix CMake script (for PCH)

[IMAGESOFT]
- Fix CMake script (for PCH)

[GREEN]
- Add header guard
- Fix CMake script (for PCH)

This fixes rosapps build with RosBE 2.1.1

CORE-7716

svn path=/trunk/; revision=62454

diff --git a/rosapps/applications/devutils/vgafontedit/CMakeLists.txt b/rosapps/applications/devutils/vgafontedit/CMakeLists.txt
index 98408f5..43bab70 100644 (file)
--- a/rosapps/applications/devutils/vgafontedit/CMakeLists.txt
+++ b/rosapps/applications/devutils/vgafontedit/CMakeLists.txt
@@ -8,10 +8,10 @@ list(APPEND SOURCE
     mainwnd.c
     misc.c
     opensave.c
-    vgafontedit.rc)
+    precomp.h)
 
+add_executable(vgafontedit ${SOURCE} vgafontedit.rc)
 add_pch(vgafontedit precomp.h SOURCE)
-add_executable(vgafontedit ${SOURCE})
 set_module_type(vgafontedit win32gui UNICODE)
 add_importlibs(vgafontedit user32 gdi32 comdlg32 msvcrt kernel32)
 add_cd_file(TARGET vgafontedit DESTINATION reactos/system32 FOR all)

diff --git a/rosapps/applications/imagesoft/CMakeLists.txt b/rosapps/applications/imagesoft/CMakeLists.txt
index a0f2275..e673619 100644 (file)
--- a/rosapps/applications/imagesoft/CMakeLists.txt
+++ b/rosapps/applications/imagesoft/CMakeLists.txt
@@ -13,10 +13,11 @@ list(APPEND SOURCE
     misc.c
     opensave.c
     tooldock.c
-    imagesoft.rc)
+    precomp.h
+    )
 
+add_executable(imagesoft ${SOURCE} imagesoft.rc)
 add_pch(imagesoft precomp.h SOURCE)
-add_executable(imagesoft ${SOURCE})
 set_module_type(imagesoft win32gui UNICODE)
 add_importlibs(imagesoft gdi32 user32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32)
 add_cd_file(TARGET imagesoft DESTINATION reactos/system32 FOR all)

diff --git a/rosapps/drivers/green/CMakeLists.txt b/rosapps/drivers/green/CMakeLists.txt
index 679deef..7c76830 100644 (file)
--- a/rosapps/drivers/green/CMakeLists.txt
+++ b/rosapps/drivers/green/CMakeLists.txt
@@ -8,9 +8,9 @@ list(APPEND SOURCE
     pnp.c
     power.c
     screen.c
-    green.rc)
+    green.h)
 
-add_library(green SHARED ${SOURCE})
+add_library(green SHARED ${SOURCE} green.rc)
 add_pch(green green.h SOURCE)
 set_module_type(green kernelmodedriver)
 add_importlibs(green ntoskrnl hal)

diff --git a/rosapps/drivers/green/green.h b/rosapps/drivers/green/green.h
index 5c3f1b2..3eaf169 100644 (file)
--- a/rosapps/drivers/green/green.h
+++ b/rosapps/drivers/green/green.h
@@ -1,3 +1,6 @@
+#ifndef __GREEN_H__
+#define __GREEN_H__
+
 #include <ntddk.h>
 #include <ntifs.h>
 #include <ntndk.h>
@@ -191,3 +194,5 @@ GreenDuplicateUnicodeString(
     IN ULONG Flags,
     IN PCUNICODE_STRING SourceString,
     OUT PUNICODE_STRING DestinationString);
+
+#endif