[ros-diffs] [mf] 12752: update Explorer Jamfile

update Explorer Jamfile
Modified: trunk/reactos/subsys/system/explorer/Jamfile
Modified: trunk/reactos/subsys/system/explorer/explorer.dsw
Modified: trunk/reactos/subsys/system/explorer/explorer.rc
Modified: trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.rc
Modified: trunk/reactos/subsys/system/explorer/rc-mingw.jam
Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h
Property changes on: trunk/reactos/subsys/system/explorer
___________________________________________________________________
Name: svn:ignore
   - *.coff
*.exe
*.d
*.o
*.a
*.sym
*.map
bin
Debug
Release
DRelease
UDebug
URelease
_NO_COMUTIL
doxy-doc
Win32
WineDll
WineRelease
*.ncb
*.opt
*.aps
*.ncb
*.plg
*.suo
buildno.h
notifyhook.dll
*.gch
*.h.pch
   + *.coff
*.exe
*.d
*.o
*.a
*.sym
*.map
bin
Debug
Release
DRelease
UDebug
URelease
_NO_COMUTIL
doxy-doc
Win32
WineDll
WineRelease
*.ncb
*.opt
*.aps
*.ncb
*.plg
*.suo
buildno.h
notifyhook.dll
*.gch
*.h.pch
pack.*
.gdbinit
start-gdb.bat
libexpat.dll
  _____  

Modified: trunk/reactos/subsys/system/explorer/Jamfile
--- trunk/reactos/subsys/system/explorer/Jamfile	2005-01-03
10:59:19 UTC (rev 12751)
+++ trunk/reactos/subsys/system/explorer/Jamfile	2005-01-03
11:25:40 UTC (rev 12752)
@@ -44,7 +44,7 @@

 	dialogs/settings.cpp
 	i386-stub-win32.c
  :	<define>WIN32 <define>_WIN32_IE=0x0600
<define>_WIN32_WINNT=0x0501 <define>WINVER=0x0500
-	<cxxflags>-I$(INCLUDE)
+	<cxxflags>-I$(INCLUDE) <cxxflags>-I.
 #nur für GCC:	<cxxflags>-fexceptions <cxxflags>-Wall
 	<find-shared-library>gdi32
 	<find-shared-library>ole32
  _____  

Modified: trunk/reactos/subsys/system/explorer/explorer.dsw
--- trunk/reactos/subsys/system/explorer/explorer.dsw	2005-01-03
10:59:19 UTC (rev 12751)
+++ trunk/reactos/subsys/system/explorer/explorer.dsw	2005-01-03
11:25:40 UTC (rev 12752)
@@ -11,6 +11,9 @@

 
 Package=<4>
 {{{
+    Begin Project Dependency
+    Project_Dep_Name notifyhook
+    End Project Dependency
 }}}
 
 
########################################################################
#######
  _____  

Modified: trunk/reactos/subsys/system/explorer/explorer.rc
--- trunk/reactos/subsys/system/explorer/explorer.rc	2005-01-03
10:59:19 UTC (rev 12751)
+++ trunk/reactos/subsys/system/explorer/explorer.rc	2005-01-03
11:25:40 UTC (rev 12752)
@@ -1,4 +1,4 @@

-/* $Id: explorer.rc,v 1.6 2004/10/16 20:27:41 gvg Exp $ */
+/* $Id$ */
 
 #include <defines.h>
 
  _____  

Modified: trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.rc
--- trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.rc
2005-01-03 10:59:19 UTC (rev 12751)
+++ trunk/reactos/subsys/system/explorer/notifyhook/notifyhook.rc
2005-01-03 11:25:40 UTC (rev 12752)
@@ -1,4 +1,4 @@

-/* $Id: notifyhook.rc,v 1.2 2004/10/16 20:27:41 gvg Exp $ */
+/* $Id$ */
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"NotifyHook DLL for ROS
Explorer\0"
  _____  

Modified: trunk/reactos/subsys/system/explorer/rc-mingw.jam
--- trunk/reactos/subsys/system/explorer/rc-mingw.jam	2005-01-03
10:59:19 UTC (rev 12751)
+++ trunk/reactos/subsys/system/explorer/rc-mingw.jam	2005-01-03
11:25:40 UTC (rev 12752)
@@ -33,12 +33,12 @@

 
 actions quietly resource-compile-mingw
 {
-    windres -o "$(<)" -i "$(>)"
+    windres -D__WINDRES__ -o "$(<)" -i "$(>)"
 }
 
 actions quietly resource-compile-cygwin
 {
-    windres --include-dir "$(>:D)" -o "$(<)" -i
"$(>)"
+    windres -D__WINDRES__ --include-dir "$(>:D)" -o "$(<)" -i
"$(>)"
 }
 
 actions quietly create-empty-object
  _____  

Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h
--- trunk/reactos/subsys/system/explorer/utility/xmlstorage.h
2005-01-03 10:59:19 UTC (rev 12751)
+++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.h
2005-01-03 11:25:40 UTC (rev 12752)
@@ -612,23 +612,6 @@

 		return out;
 	}
 
-protected:
-	Children _children;
-	AttributeMap _attributes;
-
-	std::string _leading;
-	std::string _content;
-	std::string _end_leading;
-	std::string _trailing;
-
-	XMLNode* get_first_child() const
-	{
-		if (!_children.empty())
-			return _children.front();
-		else
-			return NULL;
-	}
-
 	XMLNode* find(const XS_String& name, int n=0) const
 	{
 		for(Children::const_iterator it=_children.begin();
it!=_children.end(); ++it)
@@ -687,6 +670,23 @@
 	 /// relative XPath create function
 	XMLNode* create_relative(const char* path);
 
+protected:
+	Children _children;
+	AttributeMap _attributes;
+
+	std::string _leading;
+	std::string _content;
+	std::string _end_leading;
+	std::string _trailing;
+
+	XMLNode* get_first_child() const
+	{
+		if (!_children.empty())
+			return _children.front();
+		else
+			return NULL;
+	}
+
 	void write_worker(std::ostream& out, int indent) const;
 	void pretty_write_worker(std::ostream& out, int indent) const;
 	void smart_write_worker(std::ostream& out, int indent) const;