From 006c9f00e8d70a26538f9762f437bec5e55148ab Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Sun, 2 Oct 2005 18:31:50 +0000 Subject: [PATCH] a bit of Makefile and string constants cleanup svn path=/trunk/; revision=18228 --- reactos/subsys/system/explorer/Makefile.MinGW | 2 +- reactos/subsys/system/explorer/Makefile.PCH | 4 ++-- reactos/subsys/system/explorer/Makefile.Wine | 2 +- reactos/subsys/system/explorer/utility/xmlstorage.cpp | 6 +++--- reactos/subsys/system/explorer/utility/xmlstorage.h | 10 +++++++--- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/reactos/subsys/system/explorer/Makefile.MinGW b/reactos/subsys/system/explorer/Makefile.MinGW index 136aed656ae..678fe28ae8d 100644 --- a/reactos/subsys/system/explorer/Makefile.MinGW +++ b/reactos/subsys/system/explorer/Makefile.MinGW @@ -9,7 +9,7 @@ CXX = g++ LINK = g++ # -D_NO_ALPHABLEND for builds without msimg32.dll dependency -CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC) +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) RCFLAGS = -DWIN32 -D__WINDRES__ LFLAGS = -Wl,--subsystem,windows diff --git a/reactos/subsys/system/explorer/Makefile.PCH b/reactos/subsys/system/explorer/Makefile.PCH index 484692db631..a301d6ae7ee 100644 --- a/reactos/subsys/system/explorer/Makefile.PCH +++ b/reactos/subsys/system/explorer/Makefile.PCH @@ -10,7 +10,7 @@ CC = gcc CXX = g++ LINK = g++ -CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC) +CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC) RCFLAGS = -DWIN32 -D__WINDRES__ LFLAGS = -Wl,--subsystem,windows @@ -52,6 +52,7 @@ OBJECTS = \ window.o \ dragdropimpl.o \ shellbrowserimpl.o \ + shellservices.o \ explorer.o \ entries.o \ winfs.o \ @@ -69,7 +70,6 @@ OBJECTS = \ desktopbar.o \ taskbar.o \ startmenu.o \ - shellservices.o \ traynotify.o \ quicklaunch.o \ favorites.o \ diff --git a/reactos/subsys/system/explorer/Makefile.Wine b/reactos/subsys/system/explorer/Makefile.Wine index 6219981fde7..70e36d058e6 100644 --- a/reactos/subsys/system/explorer/Makefile.Wine +++ b/reactos/subsys/system/explorer/Makefile.Wine @@ -126,7 +126,7 @@ MV = mv LINT = LINTFLAGS = INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) -EXTRACFLAGS = -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -Wno-unused-value +EXTRACFLAGS = -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith ALLCFLAGS = $(INCLUDES) $(DEFS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 diff --git a/reactos/subsys/system/explorer/utility/xmlstorage.cpp b/reactos/subsys/system/explorer/utility/xmlstorage.cpp index 564b37c3484..7d4431e427e 100644 --- a/reactos/subsys/system/explorer/utility/xmlstorage.cpp +++ b/reactos/subsys/system/explorer/utility/xmlstorage.cpp @@ -46,9 +46,9 @@ // work around GCC's wide string constant bug #ifdef __GNUC__ -const LPCXSSTR XMLStorage::XS_TRUE = XS_TEXT("true"); -const LPCXSSTR XMLStorage::XS_FALSE = XS_TEXT("false"); -const LPCXSSTR XMLStorage::XS_NUMBERFMT = XS_TEXT("%d"); +const LPCXSSTR XMLStorage::XS_TRUE = XS_TRUE_STR; +const LPCXSSTR XMLStorage::XS_FALSE = XS_FALSE_STR; +const LPCXSSTR XMLStorage::XS_NUMBERFMT = XS_NUMBERFMT_STR; #endif diff --git a/reactos/subsys/system/explorer/utility/xmlstorage.h b/reactos/subsys/system/explorer/utility/xmlstorage.h index 060deb6346b..8024b7390f2 100644 --- a/reactos/subsys/system/explorer/utility/xmlstorage.h +++ b/reactos/subsys/system/explorer/utility/xmlstorage.h @@ -1228,15 +1228,19 @@ protected: }; +#define XS_TRUE_STR XS_TEXT("true") +#define XS_FALSE_STR XS_TEXT("false") +#define XS_NUMBERFMT_STR XS_TEXT("%d") + // work around GCC's wide string constant bug #ifdef __GNUC__ extern const LPCXSSTR XS_TRUE; extern const LPCXSSTR XS_FALSE; extern const LPCXSSTR XS_NUMBERFMT; #else -#define XS_TRUE XS_TEXT("true") -#define XS_FALSE XS_TEXT("false") -#define XS_NUMBERFMT XS_TEXT("%d") +#define XS_TRUE XS_TRUE_STR +#define XS_FALSE XS_FALSE_STR +#define XS_NUMBERFMT XS_NUMBERFMT_STR #endif -- 2.17.1