mirror of
https://github.com/reactos/reactos.git
synced 2024-12-27 01:24:38 +00:00
move public expat headers into common include folder
svn path=/trunk/; revision=13708
This commit is contained in:
Martin Fuchs
parent
68ab4001fa
commit
7e242c624b
11 changed files with 25 additions and 1126 deletions
|
|
@ -7,8 +7,7 @@
|
|||
import rc-mingw ;
|
||||
|
||||
|
||||
# -I$(INCLUDE) wird von jam offenbar ignoriert, ist aber notwendig, wenn die Headerfiles des
|
||||
# Plattform SDK anstatt der veralteten im MSDEV-Installationsverzeichnis verwendet werden sollen.
|
||||
EXPAT_INC = [ modules.peek : EXPAT_INC ] ;
|
||||
|
||||
exe explorer :
|
||||
explorer.cpp
|
||||
|
|
@ -44,8 +43,8 @@ exe explorer :
|
|||
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.
|
||||
#nur für GCC: <cxxflags>-fexceptions <cxxflags>-Wall
|
||||
<include>. <include>$(EXPAT_INC)
|
||||
# only for GCC: <cxxflags>-fexceptions <cxxflags>-Wall
|
||||
<find-shared-library>gdi32
|
||||
<find-shared-library>ole32
|
||||
<find-shared-library>comctl32
|
||||
|
|
|
|||
|
|
@ -5,20 +5,31 @@
|
|||
#
|
||||
|
||||
PATH_TO_TOP := ../../..
|
||||
|
||||
TARGET_TYPE := program
|
||||
|
||||
TARGET_APPTYPE := windows
|
||||
|
||||
TARGET_NAME := explorer
|
||||
|
||||
TARGET_INSTALLDIR := .
|
||||
|
||||
TARGET_CFLAGS := \
|
||||
-D__USE_W32API -DWIN32 -D_ROS_ \
|
||||
-D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \
|
||||
-DUNICODE -fexceptions -Wall
|
||||
-DUNICODE -fexceptions -Wall \
|
||||
-I../../../include/expat
|
||||
|
||||
TARGET_CPPFLAGS := $(TARGET_CFLAGS)
|
||||
|
||||
TARGET_RCFLAGS := -D__USE_W32API -DWIN32 -D_ROS_ -D__WINDRES__
|
||||
|
||||
TARGET_SDKLIBS := \
|
||||
gdi32.a comctl32.a ole32.a oleaut32.a shell32.a expat.a \
|
||||
notifyhook.a ws2_32.a msimg32.a
|
||||
|
||||
TARGET_GCCLIBS := stdc++ uuid
|
||||
|
||||
TARGET_OBJECTS := \
|
||||
explorer.o \
|
||||
i386-stub-win32.o \
|
||||
|
|
@ -50,13 +61,15 @@ TARGET_OBJECTS := \
|
|||
utility/dragdropimpl.o \
|
||||
utility/shellbrowserimpl.o \
|
||||
utility/xmlstorage.o
|
||||
|
||||
TARGET_CPPAPP := yes
|
||||
|
||||
TARGET_PCH := precomp.h
|
||||
|
||||
SUBDIRS := notifyhook
|
||||
|
||||
DEP_OBJECTS := $(TARGET_OBJECTS)
|
||||
|
||||
include $(PATH_TO_TOP)/rules.mak
|
||||
|
||||
include $(TOOLS_PATH)/helper.mk
|
||||
|
||||
include $(TOOLS_PATH)/depend.mk
|
||||
|
|
|
|||
|
|
@ -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 -I.
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ CC = gcc
|
|||
CXX = g++
|
||||
LINK = g++
|
||||
|
||||
CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I.
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ TARGET_INSTALLDIR := .
|
|||
TARGET_CFLAGS := \
|
||||
-D__USE_W32API -DWIN32 -D_ROS_ \
|
||||
-D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \
|
||||
-DUNICODE -fexceptions -Wall
|
||||
-DUNICODE -fexceptions -Wall \
|
||||
-I../../../include/expat
|
||||
|
||||
TARGET_CPPFLAGS := $(TARGET_CFLAGS)
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ CC = gcc
|
|||
CXX = g++
|
||||
LINK = g++
|
||||
|
||||
CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I.
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ CC = gcc
|
|||
CXX = g++
|
||||
LINK = g++
|
||||
|
||||
CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I.
|
||||
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
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,101 +0,0 @@
|
|||
/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
|
||||
See the file COPYING for copying permission.
|
||||
*/
|
||||
|
||||
#ifndef Expat_External_INCLUDED
|
||||
#define Expat_External_INCLUDED 1
|
||||
|
||||
/* External API definitions */
|
||||
|
||||
#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
|
||||
#define XML_USE_MSC_EXTENSIONS 1
|
||||
#endif
|
||||
|
||||
/* Expat tries very hard to make the API boundary very specifically
|
||||
defined. There are two macros defined to control this boundary;
|
||||
each of these can be defined before including this header to
|
||||
achieve some different behavior, but doing so it not recommended or
|
||||
tested frequently.
|
||||
|
||||
XMLCALL - The calling convention to use for all calls across the
|
||||
"library boundary." This will default to cdecl, and
|
||||
try really hard to tell the compiler that's what we
|
||||
want.
|
||||
|
||||
XMLIMPORT - Whatever magic is needed to note that a function is
|
||||
to be imported from a dynamically loaded library
|
||||
(.dll, .so, or .sl, depending on your platform).
|
||||
|
||||
The XMLCALL macro was added in Expat 1.95.7. The only one which is
|
||||
expected to be directly useful in client code is XMLCALL.
|
||||
|
||||
Note that on at least some Unix versions, the Expat library must be
|
||||
compiled with the cdecl calling convention as the default since
|
||||
system headers may assume the cdecl convention.
|
||||
*/
|
||||
#ifndef XMLCALL
|
||||
#if defined(XML_USE_MSC_EXTENSIONS)
|
||||
#define XMLCALL __cdecl
|
||||
#elif defined(__GNUC__) && defined(__i386)
|
||||
#define XMLCALL __attribute__((cdecl))
|
||||
#else
|
||||
/* For any platform which uses this definition and supports more than
|
||||
one calling convention, we need to extend this definition to
|
||||
declare the convention used on that platform, if it's possible to
|
||||
do so.
|
||||
|
||||
If this is the case for your platform, please file a bug report
|
||||
with information on how to identify your platform via the C
|
||||
pre-processor and how to specify the same calling convention as the
|
||||
platform's malloc() implementation.
|
||||
*/
|
||||
#define XMLCALL
|
||||
#endif
|
||||
#endif /* not defined XMLCALL */
|
||||
|
||||
|
||||
#if !defined(XML_STATIC) && !defined(XMLIMPORT)
|
||||
#ifndef XML_BUILDING_EXPAT
|
||||
/* using Expat from an application */
|
||||
|
||||
#ifdef XML_USE_MSC_EXTENSIONS
|
||||
#define XMLIMPORT __declspec(dllimport)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif /* not defined XML_STATIC */
|
||||
|
||||
/* If we didn't define it above, define it away: */
|
||||
#ifndef XMLIMPORT
|
||||
#define XMLIMPORT
|
||||
#endif
|
||||
|
||||
|
||||
#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifdef XML_UNICODE_WCHAR_T
|
||||
#define XML_UNICODE
|
||||
#endif
|
||||
|
||||
#ifdef XML_UNICODE /* Information is UTF-16 encoded. */
|
||||
#ifdef XML_UNICODE_WCHAR_T
|
||||
typedef wchar_t XML_Char;
|
||||
typedef wchar_t XML_LChar;
|
||||
#else
|
||||
typedef unsigned short XML_Char;
|
||||
typedef char XML_LChar;
|
||||
#endif /* XML_UNICODE_WCHAR_T */
|
||||
#else /* Information is UTF-8 encoded. */
|
||||
typedef char XML_Char;
|
||||
typedef char XML_LChar;
|
||||
#endif /* XML_UNICODE */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* not Expat_External_INCLUDED */
|
||||
Loading…
Reference in a new issue