[ros-diffs] [fireball] 57371: - Minor compiling fixes. - CMake switch.

Author: fireball
Date: Sun Sep 23 20:32:14 2012
New Revision: 57371

URL: http://svn.reactos.org/svn/reactos?rev=57371&view=rev
Log:
- Minor compiling fixes.
- CMake switch.

Added:
    branches/arwinss/reactos/dll/win32/winent.drv/CMakeLists.txt   (with props)
Modified:
    branches/arwinss/reactos/dll/win32/winent.drv/winent.h

Added: branches/arwinss/reactos/dll/win32/winent.drv/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/CMakeLists.txt (added)
+++ branches/arwinss/reactos/dll/win32/winent.drv/CMakeLists.txt [iso-8859-1] Sun Sep 23
20:32:14 2012
@@ -1,0 +1,45 @@
+
+
+add_definitions(-D__WINESRC__)
+add_definitions(-D_WINE)
+
+include_directories(
+    include
+    ${REACTOS_SOURCE_DIR}/include/reactos/wine
+    ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include
+    ${REACTOS_SOURCE_DIR}/win32ss/include)
+
+spec2def(winent.drv winent.drv.spec ADD_IMPORTLIB)
+
+list(APPEND SOURCE
+    bitblt.c
+    clipboard.c
+    dib.c
+    event.c
+    font.c
+    gdidrv.c
+    gdiobj.c
+    graphics.c
+    main.c
+    userdrv.c
+    mouse.c
+    window.c
+    ogldrv.c
+
+    winent.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/winent_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/winent.def)
+
+add_library(winent SHARED ${SOURCE})
+set_module_type(winent win32dll UNICODE)
+set_target_properties(winent PROPERTIES SUFFIX ".drv")
+
+target_link_libraries(winent
+    win32ksys
+    dxguid
+    wine
+    ${PSEH_LIB})
+
+add_importlibs(winent gdi32 user32 imm32 msvcrt kernel32 ntdll)
+#add_pch(winent include/precomp.h)
+add_cd_file(TARGET winent DESTINATION reactos/system32 FOR all)

Propchange: branches/arwinss/reactos/dll/win32/winent.drv/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen…
==============================================================================
--- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Sun Sep 23
20:32:14 2012
@@ -30,13 +30,13 @@
 #define NTOS_USER_MODE
 #include <ndk/ntndk.h>
 #include <winddi.h>
-#include <win32k/ntgdityp.h>
+#include <ntgdityp.h>
 #include "wine/rosuser.h"
 #include "wine/ntrosgdi.h"
 #include "wine/list.h"
 #include "wine/unicode.h"
 #include "wine/server.h"
-#include "win32k/ntgdihdl.h"
+#include <ntgdihdl.h>
 #include <pseh/pseh2.h>
 
 /* GDI escapes */