24 Nov
2008
24 Nov
'08
9:32 p.m.
Author: hyperion
Date: Mon Nov 24 15:32:17 2008
New Revision: 37626
URL: http://svn.reactos.org/svn/reactos?rev=37626&view=rev
Log:
Undo r37623 until cross compilation is fixed
Modified:
trunk/reactos/ReactOS-generic.rbuild
trunk/reactos/base/shell/explorer/explorer.rbuild
trunk/reactos/dll/directx/dxdiagn/container.c
trunk/reactos/dll/directx/wine/d3d8/device.c
trunk/reactos/dll/directx/wine/d3d9/device.c
trunk/reactos/dll/win32/comdlg32/printdlg.c
trunk/reactos/dll/win32/crypt32/chain.c
trunk/reactos/dll/win32/crypt32/main.c
trunk/reactos/dll/win32/crypt32/oid.c
trunk/reactos/dll/win32/crypt32/protectdata.c
trunk/reactos/dll/win32/crypt32/rootstore.c
trunk/reactos/dll/win32/dbghelp/pe_module.c
trunk/reactos/dll/win32/fusion/assembly.c
trunk/reactos/dll/win32/gdiplus/font.c
trunk/reactos/dll/win32/gdiplus/image.c
trunk/reactos/dll/win32/glu32/glu32.rbuild
trunk/reactos/dll/win32/icmp/icmp_main.c
trunk/reactos/dll/win32/kernel32/kernel32.rbuild
trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
Modified: trunk/reactos/ReactOS-generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev…
==============================================================================
--- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -119,5 +119,4 @@
<xi:include href="tools/tools.rbuild" />
</directory>
- <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
</group>
Modified: trunk/reactos/base/shell/explorer/explorer.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
==============================================================================
--- trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Mon Nov 24 15:32:17
2008
@@ -2,6 +2,7 @@
<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
<group xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="explorer" type="win32gui"
installname="explorer.exe" allowwarnings="true"
unicode="yes">
+ <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
<include base="explorer">.</include>
<define name="WIN32" />
<define name="__WINDRES__" />
Modified: trunk/reactos/dll/directx/dxdiagn/container.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dxdiagn/contai…
==============================================================================
--- trunk/reactos/dll/directx/dxdiagn/container.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dxdiagn/container.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -150,7 +150,7 @@
hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp,
&pContainer);
if (!SUCCEEDED(hr) || NULL == pContainer)
goto on_error;
- cur++; /* go after '.' (just replaced by \0) */
+ *cur++; /* go after '.' (just replaced by \0) */
tmp = cur;
cur = strchrW(tmp, '.');
}
Modified: trunk/reactos/dll/directx/wine/d3d8/device.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d8/device.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -1817,7 +1817,7 @@
}
shader = This->shader_handles[pVertexShader - (VS_HIGHESTFIXEDFXF + 1)];
- hr = IWineD3DVertexShader_GetFunction(shader->wineD3DVertexShader, pData,
(UINT*)pSizeOfData);
+ hr = IWineD3DVertexShader_GetFunction(shader->wineD3DVertexShader, pData,
pSizeOfData);
LeaveCriticalSection(&d3d8_cs);
return hr;
}
@@ -2024,7 +2024,7 @@
}
shader = This->shader_handles[pPixelShader - (VS_HIGHESTFIXEDFXF + 1)];
- hr = IWineD3DPixelShader_GetFunction(shader->wineD3DPixelShader, pData,
(UINT*)pSizeOfData);
+ hr = IWineD3DPixelShader_GetFunction(shader->wineD3DPixelShader, pData,
pSizeOfData);
LeaveCriticalSection(&d3d8_cs);
return hr;
}
Modified: trunk/reactos/dll/directx/wine/d3d9/device.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d9/device.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -277,11 +277,11 @@
surface_desc.Type = &type;
surface_desc.Usage = &dummy_dword;
surface_desc.Pool = &pool;
- surface_desc.Size = (UINT*)&dummy_dword;
- surface_desc.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *)&dummy_dword;
+ surface_desc.Size = &dummy_dword;
+ surface_desc.MultiSampleType = &dummy_dword;
surface_desc.MultiSampleQuality = &dummy_dword;
- surface_desc.Width = (UINT*)&dummy_dword;
- surface_desc.Height = (UINT*)&dummy_dword;
+ surface_desc.Width = &dummy_dword;
+ surface_desc.Height = &dummy_dword;
IWineD3DSurface_GetDesc((IWineD3DSurface *) resource, &surface_desc);
break;
@@ -291,10 +291,10 @@
volume_desc.Type = &type;
volume_desc.Usage = &dummy_dword;
volume_desc.Pool = &pool;
- volume_desc.Size = (UINT*)&dummy_dword;
- volume_desc.Width = (UINT*)&dummy_dword;
- volume_desc.Height = (UINT*)&dummy_dword;
- volume_desc.Depth = (UINT*)&dummy_dword;
+ volume_desc.Size = &dummy_dword;
+ volume_desc.Width = &dummy_dword;
+ volume_desc.Height = &dummy_dword;
+ volume_desc.Depth = &dummy_dword;
IWineD3DVolume_GetDesc((IWineD3DVolume *) resource, &volume_desc);
break;
Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/printdlg.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -1047,12 +1047,12 @@
{
if(dpiX == Resolutions[i])
IsDefault = TRUE;
- sprintf(buf, "%d dpi", (int)Resolutions[i]);
+ sprintf(buf, "%d dpi", Resolutions[i]);
} else
{
if(dpiX == Resolutions[i] && dpiY == Resolutions[i+1])
IsDefault = TRUE;
- sprintf(buf, "%d dpi x %d dpi", (int)Resolutions[i],
(int)Resolutions[i+1]);
+ sprintf(buf, "%d dpi x %d dpi", Resolutions[i], Resolutions[i+1]);
}
Index = SendMessageA(hQuality, CB_ADDSTRING, 0, (LPARAM)buf);
@@ -2471,15 +2471,15 @@
_c_size2strA(PageSetupDataA *pda,DWORD size,LPSTR strout) {
strcpy(strout,"<undef>");
if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) {
- sprintf(strout,"%d",(int)(size)/100);
+ sprintf(strout,"%d",(size)/100);
return;
}
if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) {
- sprintf(strout,"%din",(int)(size)/1000);
+ sprintf(strout,"%din",(size)/1000);
return;
}
pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
- sprintf(strout,"%d",(int)(size)/100);
+ sprintf(strout,"%d",(size)/100);
return;
}
static void
Modified: trunk/reactos/dll/win32/crypt32/chain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/chain.c?…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/chain.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -205,8 +205,9 @@
config.cbSize = sizeof(config);
CertCreateCertificateChainEngine(&config, &engine);
- HCERTCHAINENGINE Original =
(HCERTCHAINENGINE)InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine,
NULL);
- if (CRYPT_defaultChainEngine == Original || CRYPT_defaultChainEngine != engine)
+ InterlockedCompareExchangePointer(&CRYPT_defaultChainEngine, engine,
+ NULL);
+ if (CRYPT_defaultChainEngine != engine)
CertFreeCertificateChainEngine(engine);
}
return CRYPT_defaultChainEngine;
Modified: trunk/reactos/dll/win32/crypt32/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/main.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -64,9 +64,9 @@
CryptAcquireContextW(&prov, NULL, MS_ENHANCED_PROV_W, PROV_RSA_FULL,
CRYPT_VERIFYCONTEXT);
- HCRYPTPROV Original = (HCRYPTPROV)InterlockedCompareExchangePointer((PVOID
*)&hDefProv, (PVOID)prov,
- NULL);//ugly hax to satisfy GCC
- if (Original == hDefProv || hDefProv != prov)
+ InterlockedCompareExchangePointer((PVOID *)&hDefProv, (PVOID)prov,
+ NULL);
+ if (hDefProv != prov)
CryptReleaseContext(prov, 0);
}
return hDefProv;
Modified: trunk/reactos/dll/win32/crypt32/oid.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/oid.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -157,7 +157,7 @@
LPCSTR pszOID)
{
static const char szEncodingTypeFmt[] =
- "Software\\Microsoft\\Cryptography\\OID\\EncodingType %u\\%s\\%s";
+ "Software\\Microsoft\\Cryptography\\OID\\EncodingType %d\\%s\\%s";
UINT len;
char numericOID[7]; /* enough for "#65535" */
const char *oid;
@@ -185,7 +185,7 @@
szKey = CryptMemAlloc(len);
if (szKey)
sprintf(szKey, szEncodingTypeFmt,
- (unsigned int)GET_CERT_ENCODING_TYPE(dwEncodingType), pszFuncName, oid);
+ GET_CERT_ENCODING_TYPE(dwEncodingType), pszFuncName, oid);
return szKey;
}
Modified: trunk/reactos/dll/win32/crypt32/protectdata.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/protectdata.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -404,7 +404,7 @@
}
/* cipher_alg */
- if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->cipher_alg))
+ if (!unserialize_dword(ptr,&index,size,&pInfo->cipher_alg))
{
ERR("reading cipher_alg failed!\n");
return FALSE;
@@ -433,7 +433,7 @@
}
/* hash_alg */
- if (!unserialize_dword(ptr,&index,size,(DWORD*)&pInfo->hash_alg))
+ if (!unserialize_dword(ptr,&index,size,&pInfo->hash_alg))
{
ERR("reading hash_alg failed!\n");
return FALSE;
Modified: trunk/reactos/dll/win32/crypt32/rootstore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/rootstor…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/rootstore.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -314,7 +314,7 @@
static BOOL import_certs_from_dir(LPCSTR path, HCERTSTORE store)
{
BOOL ret = FALSE;
- //DIR *dir;
+ DIR *dir;
TRACE("(%s, %p)\n", debugstr_a(path), store);
/* UNIX functions = bad for reactos
@@ -752,9 +752,9 @@
{
HCERTSTORE root = create_root_store();
- HCERTSTORE Original = (HCERTSTORE)InterlockedCompareExchangePointer((PVOID
*)&CRYPT_rootStore, root,
+ InterlockedCompareExchangePointer((PVOID *)&CRYPT_rootStore, root,
NULL);
- if (CRYPT_rootStore == Original || CRYPT_rootStore != root)
+ if (CRYPT_rootStore != root)
CertCloseStore(root, 0);
}
CertDuplicateStore(CRYPT_rootStore);
Modified: trunk/reactos/dll/win32/dbghelp/pe_module.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/pe_modul…
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/pe_module.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -270,7 +270,7 @@
for (j = 0; j < exports->NumberOfNames; j++)
if ((ordinals[j] == i) && names[j]) break;
if (j < exports->NumberOfNames) continue;
- snprintf(buffer, sizeof(buffer), "%u", (unsigned int)(i +
exports->Base));
+ snprintf(buffer, sizeof(buffer), "%d", i + exports->Base);
symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1,
TRUE /* FIXME */, TRUE /* FIXME */);
}
Modified: trunk/reactos/dll/win32/fusion/assembly.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/assembly.…
==============================================================================
--- trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/assembly.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -812,7 +812,7 @@
goto done;
}
- if (!VerQueryValueA(verdata, "\\", (LPVOID *)&ffi, (PUINT)&size))
+ if (!VerQueryValueA(verdata, "\\", (LPVOID *)&ffi, &size))
{
hr = HRESULT_FROM_WIN32(GetLastError());
goto done;
Modified: trunk/reactos/dll/win32/gdiplus/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r…
==============================================================================
--- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -486,7 +486,7 @@
HDC hdc = GetDC(0);
BOOL ret = FALSE;
- if(!EnumFontFamiliesW(hdc, name, (FONTENUMPROCW)is_font_installed_proc,
(LPARAM)ntm))
+ if(!EnumFontFamiliesW(hdc, name, is_font_installed_proc, (LPARAM)ntm))
ret = TRUE;
ReleaseDC(0, hdc);
Modified: trunk/reactos/dll/win32/gdiplus/image.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?…
==============================================================================
--- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -244,7 +244,7 @@
{
IStream* stream;
HRESULT hr;
- LONG size;
+ INT size;
TRACE("%p, %p\n", image, cloneImage);
@@ -1060,7 +1060,7 @@
encode_image_func* encode_image;
LPVOID output;
unsigned int output_size;
- ULONG dummy;
+ unsigned int dummy;
int i;
old_hbmp = 0;
Modified: trunk/reactos/dll/win32/glu32/glu32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/glu32.rbui…
==============================================================================
--- trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/glu32/glu32.rbuild [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -9,6 +9,7 @@
<define name="RESOLVE_3D_TEXTURE_SUPPORT" />
<define name="BUILD_GL32" />
<define name="LIBRARYBUILD" />
+ <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
<library>ntdll</library>
<library>opengl32</library>
<library>kernel32</library>
Modified: trunk/reactos/dll/win32/icmp/icmp_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/icmp_main.c…
==============================================================================
--- trunk/reactos/dll/win32/icmp/icmp_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/icmp/icmp_main.c [iso-8859-1] Mon Nov 24 15:32:17 2008
@@ -201,7 +201,7 @@
)
{
icmp_t* icp=(icmp_t*)IcmpHandle;
- char* reqbuf;
+ unsigned char* reqbuf;
int reqsize;
struct icmp_echo_reply* ier;
@@ -214,7 +214,7 @@
struct timeval timeout;
DWORD send_time,recv_time;
struct sockaddr_in addr;
- int addrlen;
+ unsigned int addrlen;
unsigned short id,seq,cksum;
int res;
@@ -257,7 +257,7 @@
if (RequestOptions!=NULL) {
int val;
if (icp->default_opts.OptionsSize==IP_OPTS_UNKNOWN) {
- int len;
+ unsigned int len;
/* Before we mess with the options, get the default values */
len=sizeof(val);
getsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,&len);
Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Mon Nov 24 15:32:17
2008
@@ -125,6 +125,7 @@
<compilerflag compiler="cpp">-fno-exceptions</compilerflag>
<compilerflag compiler="cpp">-fno-rtti</compilerflag>
+ <compilerflag
compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
<directory name="misc">
<file>icustubs.cpp</file>
Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1]
(original)
+++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Mon Nov 24
15:32:17 2008
@@ -7,6 +7,7 @@
<linkerflag>-fno-exceptions</linkerflag>
<linkerflag>-fno-rtti</linkerflag>
-->
+ <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>
<importlibrary definition="portcls.spec" />
<define name="_NTDDK_" />
Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Nov 24 15:32:17
2008
@@ -392,7 +392,7 @@
if ( data.includes.size () > 0 )
fprintf (
fMakefile,
- "PROJECT_CINCLUDES %s %s\n",
+ "PROJECT_CFLAGS %s %s\n",
assignmentOperation,
MingwModuleHandler::GenerateGccIncludeParametersFromVector ( data.includes ).c_str
());
@@ -529,16 +529,15 @@
GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.non_if_data );
GenerateProjectGccOptions ( "=", ProjectNode.non_if_data );
- fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CINCLUDES)
$(PROJECT_CDEFINES)\n" );
- fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CINCLUDES)
$(PROJECT_CDEFINES)\n" );
+ fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)
$(PROJECT_CDEFINES)\n" );
+ fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)
$(PROJECT_CDEFINES)\n" );
fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC}
-print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () );
fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP}
-print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP}
-print-file-name=libgcc.a)' '$(shell ${TARGET_CPP}
-print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP}
-print-file-name=libmingwex.a)'\n" );
- fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -Wall\n" );
+ fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
- fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -march=$(OARCH)\n" );
+ fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" );
fprintf ( fMakefile, "endif\n" );
- fprintf ( fMakefile, "PROJECT_CFLAGS = $(PROJECT_GCCOPTIONS)
$(PROJECT_GCC_CFLAGS)\n" );
- fprintf ( fMakefile, "PROJECT_CXXFLAGS = $(PROJECT_GCCOPTIONS)
$(PROJECT_GCC_CXXFLAGS)\n" );
+ fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" );
fprintf ( fMakefile, "\n" );
}
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Nov 24
15:32:17 2008
@@ -752,7 +752,7 @@
{
fprintf ( fMakefile, "# MACROS\n" );
GenerateMacro ( assignmentOperation,
- commonflagsMacro,
+ cflagsMacro,
data,
&used_defs,
true );
@@ -1118,7 +1118,7 @@
"\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H
$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P
$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n"
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o:
$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c
$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(dependencies) |
$(INTERMEDIATE)$(SEP)$(source_dir)\n"
"\t$(ECHO_CC)\n"
- "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags)
-fno-unit-at-a-time -c $<\n",
+ "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c
$<\n",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o",
@@ -1141,12 +1141,12 @@
Rule gppRule ( "$(source): ${$(module_name)_precondition}\n"
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o:
$(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
"\t$(ECHO_CC)\n"
- "\t${gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags) -c
$<\n",
+ "\t${gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c
$<\n",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o",
NULL );
Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n"
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o:
$(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
"\t$(ECHO_CC)\n"
- "\t${host_gpp} -o $@ $($(module_name)_CXXFLAGS)$(compiler_flags)
-c $<\n",
+ "\t${host_gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c
$<\n",
"$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o",
NULL );
Rule emptyRule ( "", NULL );
@@ -1658,7 +1658,7 @@
"\t%s -o %s %s %s -g %s\n\n",
module.cplusplus ? cppc.c_str() : cc.c_str(),
backend->GetFullName ( *pchFilename ).c_str(),
- module.cplusplus ? cxxflagsMacro.c_str() : cflagsMacro.c_str(),
+ cflagsMacro.c_str(),
GenerateCompilerParametersFromVector ( module.non_if_data.compilerFlags,
module.cplusplus ? CompilerTypeCPP : CompilerTypeCC ).c_str(),
backend->GetFullName ( baseHeaderFile ).c_str() );
delete pchFilename;
@@ -1709,6 +1709,13 @@
fprintf ( fMakefile, "\n" );
return archiveFilename;
+}
+
+string
+MingwModuleHandler::GetCFlagsMacro () const
+{
+ return ssprintf ( "$(%s_CFLAGS)",
+ module.name.c_str () );
}
/*static*/ string
@@ -1840,9 +1847,7 @@
fprintf ( fMakefile, "# OTHER MACROS\n" );
- commonflagsMacro = ssprintf ("%s_COMMONFLAGS", module.name.c_str ());
cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ());
- cxxflagsMacro = ssprintf ("%s_CXXFLAGS", module.name.c_str ());
nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ());
windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ());
widlflagsMacro = ssprintf ("%s_WIDLFLAGS", module.name.c_str ());
@@ -1885,10 +1890,10 @@
fprintf ( fMakefile, "\n" );
}
- string globalCflags = " ";
- globalCflags += ssprintf ("$(%s)", commonflagsMacro.c_str ());
+ string globalCflags = "";
if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse )
{
+ globalCflags += " $(PROJECT_CFLAGS)";
if ( module.dynamicCRT )
globalCflags += " -D_DLL -D__USE_CRTIMP";
}
@@ -1925,13 +1930,7 @@
fMakefile,
"%s +=%s\n",
cflagsMacro.c_str (),
- (" $(PROJECT_CFLAGS)" + globalCflags).c_str () );
-
- fprintf (
- fMakefile,
- "%s +=%s\n",
- cxxflagsMacro.c_str (),
- (" $(PROJECT_CXXFLAGS)" + globalCflags).c_str () );
+ globalCflags.c_str () );
if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse )
{
@@ -1973,10 +1972,6 @@
"%s += %s\n\n",
cflagsMacro.c_str (),
cflags );
- fprintf ( fMakefile,
- "%s += %s\n\n",
- cxxflagsMacro.c_str (),
- cflags );
}
const char* nasmflags = ModuleHandlerInformations[module.type].nasmflags;
@@ -2002,17 +1997,12 @@
fprintf ( fMakefile,
"%s += -Wno-main\n\n",
cflagsMacro.c_str () );
- fprintf ( fMakefile,
- "%s += -Wno-main\n\n",
- cxxflagsMacro.c_str () );
}
fprintf ( fMakefile, "\n\n" );
// future references to the macros will be to get their values
- commonflagsMacro = ssprintf ("$(%s)", commonflagsMacro.c_str ());
cflagsMacro = ssprintf ("$(%s)", cflagsMacro.c_str ());
- cxxflagsMacro = ssprintf ("$(%s)", cxxflagsMacro.c_str ());
nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ());
widlflagsMacro = ssprintf ("$(%s)", widlflagsMacro.c_str ());
}
Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Mon Nov 24
15:32:17 2008
@@ -98,6 +98,7 @@
const Module& module ) const;
std::string GetPreconditionDependenciesName () const;
+ std::string GetCFlagsMacro () const;
static std::string GetObjectsMacro ( const Module& );
std::string GetLinkingDependenciesMacro () const;
std::string GetLibsMacro () const;
@@ -171,9 +172,7 @@
public:
const Module& module;
string_list clean_files;
- std::string commonflagsMacro;
std::string cflagsMacro;
- std::string cxxflagsMacro;
std::string nasmflagsMacro;
std::string windresflagsMacro;
std::string widlflagsMacro;