[sir_richard] 48825: [MISC]: Fix several compiler issues on my main build box. Some of the Unicode translations in kernel32 fail to compile, while other libraries don't build because old C library ...

Author: sir_richard
Date: Mon Sep 20 06:30:21 2010
New Revision: 48825

URL: http://svn.reactos.org/svn/reactos?rev=48825&view=rev
Log:
[MISC]: Fix several compiler issues on my main build box. Some of the Unicode translations
in kernel32 fail to compile, while other libraries don't build because old C library
names (without the underscore) are used.
[SETUPLDR]: Unify the old setupldr settings with more recent freeldr ones. Also fixes
missing _udiv/mod functions on my build.

Modified:
    trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild
    trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild
    trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild
    trunk/reactos/dll/win32/kernel32/nls/cht.nls
    trunk/reactos/dll/win32/kernel32/nls/zhm.nls
    trunk/reactos/lib/3rdparty/libmpg123/libmpg123.rbuild

Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Mon Sep 20 06:30:21
2010
@@ -17,4 +17,8 @@
 	<library>cportlib</library>
 	<library>rtl</library>
 	<library>libcntpr</library>
+	<group linkerset="ld">
+		<linkerflag>-static</linkerflag>
+		<linkerflag>-lgcc</linkerflag>
+	</group>
 </module>

Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Mon Sep 20
06:30:21 2010
@@ -5,13 +5,6 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_NTHAL_" />
 	<define name="FREELDR_REACTOS_SETUP" />
-	<group compilerset="gcc">
-		<compilerflag>-ffreestanding</compilerflag>
-		<compilerflag>-fno-builtin</compilerflag>
-		<compilerflag>-fno-inline</compilerflag>
-		<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
-		<compilerflag>-Os</compilerflag>
-	</group>
 	<file>bootmgr.c</file>
 	<directory name="inffile">
 		<file>inffile.c</file>

Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.…
==============================================================================
--- trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] Mon Sep 20 06:30:21 2010
@@ -15,6 +15,8 @@
 		<define name="UNW_FLAG_UHANDLER">2</define>
 		<define name="UNW_FLAG_CHAININFO">3</define>
 	</if>
+	<define name="lseek">_lseek</define>
+    <define name="read">_read</define>
 	<file>coff.c</file>
 	<file>cpu_i386.c</file>
 	<file>cpu_ppc.c</file>

Modified: trunk/reactos/dll/win32/kernel32/nls/cht.nls
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/cht…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/nls/cht.nls [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/nls/cht.nls [iso-8859-1] Mon Sep 20 06:30:21 2010
@@ -80,9 +80,9 @@
   LOCALE_SABBREVMONTHNAME7 "¤C¤ë"
   LOCALE_SABBREVMONTHNAME8 "¤K¤ë"
   LOCALE_SABBREVMONTHNAME9 "¤E¤ë"
-  LOCALE_SABBREVMONTHNAME10 "¤Q¤ë"
-  LOCALE_SABBREVMONTHNAME11 "¤Q¤@¤ë"
-  LOCALE_SABBREVMONTHNAME12 "¤Q¤G¤ë"
+  LOCALE_SABBREVMONTHNAME10 "BROKEN PLEASE FIX"
+  LOCALE_SABBREVMONTHNAME11 "BROKEN PLEASE FIX"
+  LOCALE_SABBREVMONTHNAME12 "BROKEN PLEASE FIX"
   LOCALE_SABBREVMONTHNAME13 ""
   LOCALE_SCOUNTRY "Taiwan"
   LOCALE_SCURRENCY "NT$"
@@ -116,9 +116,9 @@
   LOCALE_SMONTHNAME7 "¤C¤ë"
   LOCALE_SMONTHNAME8 "¤K¤ë"
   LOCALE_SMONTHNAME9 "¤E¤ë"
-  LOCALE_SMONTHNAME10 "¤Q¤ë"
-  LOCALE_SMONTHNAME11 "¤Q¤@¤ë"
-  LOCALE_SMONTHNAME12 "¤Q¤G¤ë"
+  LOCALE_SMONTHNAME10 "BROKEN PLEASE FIX"
+  LOCALE_SMONTHNAME11 "BROKEN PLEASE FIX"
+  LOCALE_SMONTHNAME12 "BROKEN PLEASE FIX"
   LOCALE_SMONTHNAME13 ""
   LOCALE_SMONTHOUSANDSEP ","
   LOCALE_SNAME "zh-TW"

Modified: trunk/reactos/dll/win32/kernel32/nls/zhm.nls
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/zhm…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/nls/zhm.nls [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/nls/zhm.nls [iso-8859-1] Mon Sep 20 06:30:21 2010
@@ -80,9 +80,9 @@
   LOCALE_SABBREVMONTHNAME7 "¤C¤ë"
   LOCALE_SABBREVMONTHNAME8 "¤K¤ë"
   LOCALE_SABBREVMONTHNAME9 "¤E¤ë"
-  LOCALE_SABBREVMONTHNAME10 "¤Q¤ë"
-  LOCALE_SABBREVMONTHNAME11 "¤Q¤@¤ë"
-  LOCALE_SABBREVMONTHNAME12 "¤Q¤G¤ë"
+  LOCALE_SABBREVMONTHNAME10 "BROKEN PLEASE FIX"
+  LOCALE_SABBREVMONTHNAME11 "BROKEN PLEASE FIX"
+  LOCALE_SABBREVMONTHNAME12 "BROKEN PLEASE FIX"
   LOCALE_SABBREVMONTHNAME13 ""
   LOCALE_SCOUNTRY "Macau S.A.R."
   LOCALE_SCURRENCY "P"
@@ -116,9 +116,9 @@
   LOCALE_SMONTHNAME7 "¤C¤ë"
   LOCALE_SMONTHNAME8 "¤K¤ë"
   LOCALE_SMONTHNAME9 "¤E¤ë"
-  LOCALE_SMONTHNAME10 "¤Q¤ë"
-  LOCALE_SMONTHNAME11 "¤Q¤@¤ë"
-  LOCALE_SMONTHNAME12 "¤Q¤G¤ë"
+  LOCALE_SMONTHNAME10 "BROKEN PLEASE FIX"
+  LOCALE_SMONTHNAME11 "BROKEN PLEASE FIX"
+  LOCALE_SMONTHNAME12 "BROKEN PLEASE FIX"
   LOCALE_SMONTHNAME13 ""
   LOCALE_SMONTHOUSANDSEP ","
   LOCALE_SNAME "zh-MO"

Modified: trunk/reactos/lib/3rdparty/libmpg123/libmpg123.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libmpg123/lib…
==============================================================================
--- trunk/reactos/lib/3rdparty/libmpg123/libmpg123.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/libmpg123/libmpg123.rbuild [iso-8859-1] Mon Sep 20 06:30:21
2010
@@ -9,6 +9,10 @@
 	<define name="EOVERFLOW">75</define>
 	<include base="libmpg123">.</include>
 	<include base="ReactOS">include/reactos/libs/libmpg123</include>
+	<!-- FIXME: workarounds until we have a proper oldnames library -->
+    <define name="lseek">_lseek</define>
+    <define name="read">_read</define>
+    <define name="strdup">_strdup</define>
 	<file>compat.c</file>
 	<file>dct64.c</file>
 	<file>dct64_i386.c</file>