From: Emanuele Aliberti <ea@iol.it>
Date: Fri, 12 Aug 2005 13:46:36 +0000 (+0000)
Subject: Make the 'rosky' optional module compile.
X-Git-Tag: ReactOS-0.2.8~1056
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=420b109b727541fffc4f1d3df6b2c9b5f4a28552

Make the 'rosky' optional module compile.

svn path=/trunk/; revision=17325
---

diff --git a/rosky/directory.xml b/rosky/directory.xml
new file mode 100644
index 00000000000..1e8f27df556
--- /dev/null
+++ b/rosky/directory.xml
@@ -0,0 +1,4 @@
+<directory name="lib">
+	<xi:include href="lib/directory.xml" />
+</directory>
+
diff --git a/rosky/include/rosky.h b/rosky/include/rosky.h
index 2c36abbb175..a050298693a 100644
--- a/rosky/include/rosky.h
+++ b/rosky/include/rosky.h
@@ -2,6 +2,6 @@
  * ReactOS SkyOS headers
  */
 
-#include <rosky/structs.h>
-#include <rosky/defines.h>
+#include <structs.h>
+#include <defines.h>
 
diff --git a/rosky/lib/directory.xml b/rosky/lib/directory.xml
new file mode 100644
index 00000000000..587498c8096
--- /dev/null
+++ b/rosky/lib/directory.xml
@@ -0,0 +1,8 @@
+<group>
+	<directory name="libsky">
+		<xi:include href="libsky/libsky.xml" />
+	</directory>
+	<directory name="libskygi">
+		<xi:include href="libskygi/libskygi.xml" />
+	</directory>
+</group>
diff --git a/rosky/lib/libsky/libsky.h b/rosky/lib/libsky/libsky.h
index 0bdb5da39b6..9b9c19cfc85 100644
--- a/rosky/lib/libsky/libsky.h
+++ b/rosky/lib/libsky/libsky.h
@@ -3,6 +3,10 @@
 
 void __cdecl DbgPrint(char *, ...);
 
+#if defined(DBG)
+#undef DBG
+#endif
+
 #ifdef DEBUG
 # ifdef NDEBUG
 #  define DBG(...)
diff --git a/rosky/lib/libsky/libsky.xml b/rosky/lib/libsky/libsky.xml
new file mode 100644
index 00000000000..1439137c5af
--- /dev/null
+++ b/rosky/lib/libsky/libsky.xml
@@ -0,0 +1,12 @@
+<module name="libsky" type="win32dll"  installbase="system32" installname="libsky.dll">
+	<importlibrary definition="libsky.def" />
+	<include base="libsky">.</include>
+	<include base="libskygi">../../include</include>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__USE_W32API" />
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<file>libsky.c</file>
+	<file>stubs.c</file>
+	<file>libsky.rc</file>
+</module>
diff --git a/rosky/lib/libsky/stubs.c b/rosky/lib/libsky/stubs.c
index 349750083a1..9416e900b65 100644
--- a/rosky/lib/libsky/stubs.c
+++ b/rosky/lib/libsky/stubs.c
@@ -11,6 +11,7 @@
  */
 #include <windows.h>
 /* #define NDEBUG */
+#include <debug.h>
 #include "libsky.h"
 
 
diff --git a/rosky/lib/libskygi/libskygi.c b/rosky/lib/libskygi/libskygi.c
index b0f50cce19d..87a10c7007d 100644
--- a/rosky/lib/libskygi/libskygi.c
+++ b/rosky/lib/libskygi/libskygi.c
@@ -27,10 +27,13 @@
  */
 #include <windows.h>
 #include <stdio.h>
-#include <rosky/rosky.h>
+#include <rosky.h>
 #include "libskygi.h"
 #include "resource.h"
 
+#define NDEBUG
+#include <debug.h>
+
 typedef struct
 {
   s_window Window;
diff --git a/rosky/lib/libskygi/libskygi.h b/rosky/lib/libskygi/libskygi.h
index 3cc4f64c653..da236cf1e5e 100644
--- a/rosky/lib/libskygi/libskygi.h
+++ b/rosky/lib/libskygi/libskygi.h
@@ -3,7 +3,11 @@
 
 ULONG DbgPrint(PCH Format,...);
 
-#define DBG DbgPrint
+#if defined(DBG)
+#undef DBG
+#endif
+
+#define DBG DPRINT
 #define STUB DbgPrint("Stub in %s:%i: ", __FILE__, __LINE__); DbgPrint
 
 #endif /* __LIBSKY_H */
diff --git a/rosky/lib/libskygi/libskygi.xml b/rosky/lib/libskygi/libskygi.xml
new file mode 100644
index 00000000000..8520777d629
--- /dev/null
+++ b/rosky/lib/libskygi/libskygi.xml
@@ -0,0 +1,14 @@
+<module name="libskygi" type="win32dll"  installbase="system32" installname="libskygi.dll">
+	<importlibrary definition="libskygi.def" />
+	<include base="libskygi">.</include>
+	<include base="libskygi">../../include</include>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="__USE_W32API" />
+	<library>ntdll</library>
+	<library>kernel32</library>
+	<library>gdi32</library>
+	<file>libskygi.c</file>
+	<file>stubs.c</file>
+	<file>libskygi.rc</file>
+</module>
diff --git a/rosky/lib/libskygi/stubs.c b/rosky/lib/libskygi/stubs.c
index be101ed6524..7560c0460bc 100644
--- a/rosky/lib/libskygi/stubs.c
+++ b/rosky/lib/libskygi/stubs.c
@@ -10,9 +10,12 @@
  *      08/12/2004  Created
  */
 #include <windows.h>
-#include <rosky/rosky.h>
+#include <rosky.h>
 #include "libskygi.h"
 
+#define NDEBUG
+#include <debug.h>
+
 
 /*
  * @unimplemented
diff --git a/rosky/makefile b/rosky/makefile
new file mode 100644
index 00000000000..779e0204b84
--- /dev/null
+++ b/rosky/makefile
@@ -0,0 +1,14 @@
+all: 
+	@echo To build "rosky" there are two paths:
+	@echo ---
+	@echo 1. copy the rosky folder into the reactos\modules folder
+	@echo 2. link reactos/modules/rosky to rosky
+	@echo    UNIX
+	@echo         cd $${ROS_SRC_ROOT}/reactos/modules
+	@echo         ln -s $${ROS_SRC_ROOT}/rosky rosky
+	@echo    WINDOWS
+	@echo         cd %%ROS_SRC_ROOT%%\reactos\modules
+	@echo         junction rosky %%ROS_SRC_ROOT%%\rosky
+	@echo ---
+	@echo Eventually you can run "make depends" in the %%ROS_SRC_ROOT%%\reactos
+	@echo directory to compile it.