reactos/lib/crtdll
diff -u -r1.67 -r1.68
--- makefile 16 Sep 2004 10:25:12 -0000 1.67
+++ makefile 3 Oct 2004 14:24:42 -0000 1.68
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.67 2004/09/16 10:25:12 gvg Exp $
+# $Id: makefile,v 1.68 2004/10/03 14:24:42 weiden Exp $
PATH_TO_TOP = ../..
@@ -12,6 +12,9 @@
TARGET_BASE = $(TARGET_BASE_LIB_CRTDLL)
+# don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports
+RM_AT_FROM_SYMBOLS = no
+
TARGET_LFLAGS = -nostartfiles -nostdlib
TARGET_CFLAGS = -D_MSVCRT_LIB_ -Werror -Wall
reactos/lib/msvcrt20
diff -u -r1.2 -r1.3
--- Makefile 29 May 2004 21:24:44 -0000 1.2
+++ Makefile 3 Oct 2004 14:24:43 -0000 1.3
@@ -9,6 +9,9 @@
TARGET_BASE = $(TARGET_BASE_LIB_MSVCRT20)
+# don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports
+RM_AT_FROM_SYMBOLS = no
+
TARGET_LFLAGS = -nostartfiles --enable-stdcall-fixup
TARGET_SDKLIBS = libwine.a string.a kernel32.a ntdll.a
reactos/lib/msvcrt
diff -u -r1.47 -r1.48
--- Makefile 27 Aug 2004 03:08:23 -0000 1.47
+++ Makefile 3 Oct 2004 14:24:43 -0000 1.48
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.47 2004/08/27 03:08:23 navaraf Exp $
+# $Id: Makefile,v 1.48 2004/10/03 14:24:43 weiden Exp $
PATH_TO_TOP = ../..
@@ -12,6 +12,9 @@
TARGET_BASE = $(TARGET_BASE_LIB_MSVCRT)
+# don't remove @nn from exported symbols - needed so dlltool doesn't mess up mangled c++ exports
+RM_AT_FROM_SYMBOLS = no
+
TARGET_LFLAGS = -nostartfiles --enable-stdcall-fixup
TARGET_SDKLIBS = libwine.a string.a kernel32.a ntdll.a
reactos/tools
diff -u -r1.82 -r1.83
--- helper.mk 2 Oct 2004 14:03:51 -0000 1.82
+++ helper.mk 3 Oct 2004 14:24:43 -0000 1.83
@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.82 2004/10/02 14:03:51 chorns Exp $
+# $Id: helper.mk,v 1.83 2004/10/03 14:24:43 weiden Exp $
#
# Helper makefile for ReactOS modules
# Variables this makefile accepts:
@@ -357,6 +357,11 @@
# can be overidden with $(CXX) for linkage of c++ executables
LD_CC = $(CC)
+ifeq ($(RM_AT_FROM_SYMBOLS),no)
+ MK_KILLAT :=
+else
+ MK_KILLAT := --kill-at
+endif
ifeq ($(TARGET_TYPE),program)
ifeq ($(TARGET_APPTYPE),windows)
@@ -671,7 +676,7 @@
--dllname $(MK_FULLNAME) \
--def $(MK_DEFNAME) \
--output-lib $(MK_IMPLIBPATH)/$(MK_BASENAME).a \
- --kill-at
+ $(MK_KILLAT)
else # MK_IMPLIBONLY
@@ -720,7 +725,7 @@
- $(RM) junk.tmp
$(DLLTOOL) --dllname $(MK_FULLNAME) \
--base-file base.tmp \
- --output-exp temp.exp --kill-at $(MK_EXTRACMD)
+ --output-exp temp.exp $(MK_KILLAT) $(MK_EXTRACMD)
- $(RM) base.tmp
endif
$(LD_CC) $(TARGET_LFLAGS) \
@@ -762,7 +767,7 @@
- $(RM) junk.tmp
$(DLLTOOL) --dllname $(MK_FULLNAME) \
--base-file base.tmp \
- --output-exp temp.exp --kill-at $(MK_EXTRACMD)
+ --output-exp temp.exp $(MK_KILLAT) $(MK_EXTRACMD)
- $(RM) base.tmp
endif
$(LD_CC) $(TARGET_LFLAGS) \
@@ -798,7 +803,7 @@
- $(RM) junk.tmp
$(DLLTOOL) --dllname $(MK_FULLNAME) \
--base-file base.tmp \
- --output-exp temp.exp $(MK_EXTRACMD) --kill-at
+ --output-exp temp.exp $(MK_EXTRACMD) $(MK_KILLAT)
- $(RM) base.tmp
$(LD_CC) $(TARGET_LFLAGS) \
-Wl,--subsystem,native \
@@ -830,7 +835,7 @@
- $(RM) junk.tmp
$(DLLTOOL) --dllname $(MK_FULLNAME) \
--base-file base.tmp \
- --output-exp temp.exp $(MK_EXTRACMD) --kill-at
+ --output-exp temp.exp $(MK_EXTRACMD) $(MK_KILLAT)
- $(RM) base.tmp
$(LD_CC) $(TARGET_LFLAGS) \
-Wl,--subsystem,native \
@@ -881,7 +886,7 @@
$(DLLTOOL) --dllname $(MK_FULLNAME) \
--def $(MK_DEFNAME) \
--output-lib $(MK_IMPLIBPATH)/$(MK_BASENAME).a \
- --kill-at
+ $(MK_KILLAT)
implib: $(MK_IMPLIBPATH)/$(MK_BASENAME).a
else