Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-26 17:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

a bit of Makefile and string constants cleanup

Browse source 
svn path=/trunk/; revision=18228
This commit is contained in:
Martin Fuchs 2005-10-02 18:31:50 +00:00
parent 723b42a105
commit 006c9f00e8
5 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsys/system/explorer/Makefile.MinGW
View file

@ -9,7 +9,7 @@ CXX = g++
LINK = g++ LINK = g++
# -D_NO_ALPHABLEND for builds without msimg32.dll dependency # -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__ RCFLAGS = -DWIN32 -D__WINDRES__
LFLAGS = -Wl,--subsystem,windows LFLAGS = -Wl,--subsystem,windows

4
reactos/subsys/system/explorer/Makefile.PCH
View file

@ -10,7 +10,7 @@ CC = gcc
CXX = g++ CXX = g++
LINK = 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__ RCFLAGS = -DWIN32 -D__WINDRES__
LFLAGS = -Wl,--subsystem,windows LFLAGS = -Wl,--subsystem,windows
@ -52,6 +52,7 @@ OBJECTS = \
window.o \ window.o \
dragdropimpl.o \ dragdropimpl.o \
shellbrowserimpl.o \ shellbrowserimpl.o \
shellservices.o \
explorer.o \ explorer.o \
entries.o \ entries.o \
winfs.o \ winfs.o \
@ -69,7 +70,6 @@ OBJECTS = \
desktopbar.o \ desktopbar.o \
taskbar.o \ taskbar.o \
startmenu.o \ startmenu.o \
shellservices.o \
traynotify.o \ traynotify.o \
quicklaunch.o \ quicklaunch.o \
favorites.o \ favorites.o \

2
reactos/subsys/system/explorer/Makefile.Wine
View file

@ -126,7 +126,7 @@ MV = mv
LINT = LINT =
LINTFLAGS = LINTFLAGS =
INCLUDES = -I$(SRCDIR) -I. -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include $(EXTRAINCL) 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) ALLCFLAGS = $(INCLUDES) $(DEFS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS)
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755

6
reactos/subsys/system/explorer/utility/xmlstorage.cpp
View file

@ -46,9 +46,9 @@
// work around GCC's wide string constant bug // work around GCC's wide string constant bug
#ifdef __GNUC__ #ifdef __GNUC__
const LPCXSSTR XMLStorage::XS_TRUE = XS_TEXT("true"); const LPCXSSTR XMLStorage::XS_TRUE = XS_TRUE_STR;
const LPCXSSTR XMLStorage::XS_FALSE = XS_TEXT("false"); const LPCXSSTR XMLStorage::XS_FALSE = XS_FALSE_STR;
const LPCXSSTR XMLStorage::XS_NUMBERFMT = XS_TEXT("%d"); const LPCXSSTR XMLStorage::XS_NUMBERFMT = XS_NUMBERFMT_STR;
#endif #endif

10
reactos/subsys/system/explorer/utility/xmlstorage.h
View 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 // work around GCC's wide string constant bug
#ifdef __GNUC__ #ifdef __GNUC__
extern const LPCXSSTR XS_TRUE; extern const LPCXSSTR XS_TRUE;
extern const LPCXSSTR XS_FALSE; extern const LPCXSSTR XS_FALSE;
extern const LPCXSSTR XS_NUMBERFMT; extern const LPCXSSTR XS_NUMBERFMT;
#else #else
#define XS_TRUE XS_TEXT("true") #define XS_TRUE XS_TRUE_STR
#define XS_FALSE XS_TEXT("false") #define XS_FALSE XS_FALSE_STR
#define XS_NUMBERFMT XS_TEXT("%d") #define XS_NUMBERFMT XS_NUMBERFMT_STR
#endif #endif