12 Aug
2005
12 Aug
'05
1:46 p.m.
Make the 'rosky' optional module compile.
Added: trunk/rosky/directory.xml
Modified: trunk/rosky/include/rosky.h
Added: trunk/rosky/lib/directory.xml
Modified: trunk/rosky/lib/libsky/libsky.h
Added: trunk/rosky/lib/libsky/libsky.xml
Modified: trunk/rosky/lib/libsky/stubs.c
Modified: trunk/rosky/lib/libskygi/libskygi.c
Modified: trunk/rosky/lib/libskygi/libskygi.h
Added: trunk/rosky/lib/libskygi/libskygi.xml
Modified: trunk/rosky/lib/libskygi/stubs.c
Added: trunk/rosky/makefile
_____
Added: trunk/rosky/directory.xml
--- trunk/rosky/directory.xml 2005-08-12 12:31:33 UTC (rev 17324)
+++ trunk/rosky/directory.xml 2005-08-12 13:46:36 UTC (rev 17325)
@@ -0,0 +1,4 @@
+<directory name="lib">
+ <xi:include href="lib/directory.xml" />
+</directory>
+
Property changes on: trunk/rosky/directory.xml
___________________________________________________________________
Name: svn:eol-style
+ native
_____
Modified: trunk/rosky/include/rosky.h
--- trunk/rosky/include/rosky.h 2005-08-12 12:31:33 UTC (rev 17324)
+++ trunk/rosky/include/rosky.h 2005-08-12 13:46:36 UTC (rev 17325)
@@ -2,6 +2,6 @@
* ReactOS SkyOS headers
*/
-#include <rosky/structs.h>
-#include <rosky/defines.h>
+#include <structs.h>
+#include <defines.h>
_____
Added: trunk/rosky/lib/directory.xml
--- trunk/rosky/lib/directory.xml 2005-08-12 12:31:33 UTC (rev
17324)
+++ trunk/rosky/lib/directory.xml 2005-08-12 13:46:36 UTC (rev
17325)
@@ -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>
Property changes on: trunk/rosky/lib/directory.xml
___________________________________________________________________
Name: svn:eol-style
+ native
_____
Modified: trunk/rosky/lib/libsky/libsky.h
--- trunk/rosky/lib/libsky/libsky.h 2005-08-12 12:31:33 UTC (rev
17324)
+++ trunk/rosky/lib/libsky/libsky.h 2005-08-12 13:46:36 UTC (rev
17325)
@@ -3,6 +3,10 @@
void __cdecl DbgPrint(char *, ...);
+#if defined(DBG)
+#undef DBG
+#endif
+
#ifdef DEBUG
# ifdef NDEBUG
# define DBG(...)
_____
Added: trunk/rosky/lib/libsky/libsky.xml
--- trunk/rosky/lib/libsky/libsky.xml 2005-08-12 12:31:33 UTC (rev
17324)
+++ trunk/rosky/lib/libsky/libsky.xml 2005-08-12 13:46:36 UTC (rev
17325)
@@ -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>
Property changes on: trunk/rosky/lib/libsky/libsky.xml
___________________________________________________________________
Name: svn:keywords
+ author date id revision
Name: svn:eol-style
+ native
_____
Modified: trunk/rosky/lib/libsky/stubs.c
--- trunk/rosky/lib/libsky/stubs.c 2005-08-12 12:31:33 UTC (rev
17324)
+++ trunk/rosky/lib/libsky/stubs.c 2005-08-12 13:46:36 UTC (rev
17325)
@@ -11,6 +11,7 @@
*/
#include <windows.h>
/* #define NDEBUG */
+#include <debug.h>
#include "libsky.h"
_____
Modified: trunk/rosky/lib/libskygi/libskygi.c
--- trunk/rosky/lib/libskygi/libskygi.c 2005-08-12 12:31:33 UTC (rev
17324)
+++ trunk/rosky/lib/libskygi/libskygi.c 2005-08-12 13:46:36 UTC (rev
17325)
@@ -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;
_____
Modified: trunk/rosky/lib/libskygi/libskygi.h
--- trunk/rosky/lib/libskygi/libskygi.h 2005-08-12 12:31:33 UTC (rev
17324)
+++ trunk/rosky/lib/libskygi/libskygi.h 2005-08-12 13:46:36 UTC (rev
17325)
@@ -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 */
_____
Added: trunk/rosky/lib/libskygi/libskygi.xml
--- trunk/rosky/lib/libskygi/libskygi.xml 2005-08-12 12:31:33 UTC
(rev 17324)
+++ trunk/rosky/lib/libskygi/libskygi.xml 2005-08-12 13:46:36 UTC
(rev 17325)
@@ -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>
Property changes on: trunk/rosky/lib/libskygi/libskygi.xml
___________________________________________________________________
Name: svn:keywords
+ author date id revision
Name: svn:eol-style
+ native
_____
Modified: trunk/rosky/lib/libskygi/stubs.c
--- trunk/rosky/lib/libskygi/stubs.c 2005-08-12 12:31:33 UTC (rev
17324)
+++ trunk/rosky/lib/libskygi/stubs.c 2005-08-12 13:46:36 UTC (rev
17325)
@@ -10,10 +10,13 @@
* 08/12/2004 Created
*/
#include <windows.h>
-#include <rosky/rosky.h>
+#include <rosky.h>
#include "libskygi.h"
+#define NDEBUG
+#include <debug.h>
+
/*
* @unimplemented
*/
_____
Added: trunk/rosky/makefile
--- trunk/rosky/makefile 2005-08-12 12:31:33 UTC (rev 17324)
+++ trunk/rosky/makefile 2005-08-12 13:46:36 UTC (rev 17325)
@@ -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.
Property changes on: trunk/rosky/makefile
___________________________________________________________________
Name: svn:keywords
+ author date id revision
Name: svn:eol-style
+ native
7035
days inactive
7035
days old
0 comments
1 participants
participants (1)
-
ea＠svn.reactos.com