a bit of Makefile and string constants cleanup
authorMartin Fuchs <fuchs.martin@gmail.com>
Sun, 2 Oct 2005 18:31:50 +0000 (18:31 +0000)
committerMartin Fuchs <fuchs.martin@gmail.com>
Sun, 2 Oct 2005 18:31:50 +0000 (18:31 +0000)
svn path=/trunk/; revision=18228

reactos/subsys/system/explorer/Makefile.MinGW
reactos/subsys/system/explorer/Makefile.PCH
reactos/subsys/system/explorer/Makefile.Wine
reactos/subsys/system/explorer/utility/xmlstorage.cpp
reactos/subsys/system/explorer/utility/xmlstorage.h

index 136aed6..678fe28 100644 (file)
@@ -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
 
index 484692d..a301d6a 100644 (file)
@@ -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 \
index 6219981..70e36d0 100644 (file)
@@ -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
index 564b37c..7d4431e 100644 (file)
@@ -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
 
 
index 060deb6..8024b73 100644 (file)
@@ -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