Changeset 10005 for trunk/src/msvcrt/msvcrt.mak

Timestamp:

Apr 10, 2003, 12:28:07 PM (23 years ago)

Author:

sandervl

Message:

PF: MSVCRT update

File:

• trunk/src/msvcrt/msvcrt.mak (modified) (9 diffs)

trunk/src/msvcrt/msvcrt.mak

@@ -1 @@
-# $Id: msvcrt.mak,v 1.7 2003-01-15 10:43:16 sandervl Exp $
+# $Id: msvcrt.mak,v 1.8 2003-04-10 10:28:03 sandervl Exp $
 
 #
@@ -13 +13 @@
 MAKEFILE = msvcrt.mak
 CCENV = EMX
+WRC_PREFIX_RESOURCE=1
 NOTEXPDEF = 1
 
@@ -22 +23 @@
 
 !ifndef WMAKE
-CDEFINES    = -I. $(CDEFINES) -DUSE_MSVCRT_PREFIX -D_MT -I$(ODIN32_INCLUDE)\win\msvcrt 
+CDEFINES    = -I$(ODIN32_INCLUDE)\emxruntime -I. $(CDEFINES) -DUSE_MSVCRT_PREFIX -D_MT -I$(ODIN32_INCLUDE)\win\msvcrt 
 !else
 CDEFINES   += -DUSE_MSVCRT_PREFIX -D_MT -I$(ODIN32_INCLUDE)\win\msvcrt
 !endif
-
 
 #
@@ -32 +32 @@
 #
 OBJS = \
+$(OBJDIR)\initterm.obj \
+$(OBJDIR)\initmsvcrtdll.obj \
 $(OBJDIR)\ctype.obj \
 $(OBJDIR)\cpp.obj \
@@ -37 +39 @@
 $(OBJDIR)\console.obj \
 $(OBJDIR)\data.obj \
+$(OBJDIR)\dbgcalls.obj \
 $(OBJDIR)\dir.obj \
 $(OBJDIR)\environ.obj \
@@ -49 +52 @@
 $(OBJDIR)\main.obj \
 $(OBJDIR)\scanf.obj \
+$(OBJDIR)\forwarders.obj \
 $(OBJDIR)\math.obj \
 $(OBJDIR)\mbcs.obj \
@@ -57 +61 @@
 $(OBJDIR)\time.obj \
 $(OBJDIR)\wcs.obj \
-$(OBJDIR)\rtlbitmap.obj \
 $(OBJDIR)\relay2.obj \
 $(OBJDIR)\$(TARGET)rsrc.obj 
 
+LIBS = \
+$(ODIN32_LIB_)\EmxSupport\EMXOS2FSRoutines.lib \
+$(EMX)\lib\iberty_s.lib \
+$(EMX)\lib\gcc-lib\i386-pc-os2-emx\3.2.1\mt\stdcxx.lib \
+$(EMX)\lib\c_alias.lib \
+$(EMX)\lib\gcc-lib\i386-pc-os2-emx\3.2.1\mt\gcc_eh.lib \
+$(EMX)\lib\gcc-lib\i386-pc-os2-emx\3.2.1\mt\gcc.lib \
+$(EMX)\lib\mt\c.lib \
+$(EMX)\lib\mt\c_dllso.lib \
+$(EMX)\lib\mt\sys.lib \
+$(EMX)\lib\os2.lib \
+$(ODIN32_LIB_)\EmxSupport\ExCRuntime.lib \
+$(ODIN32_LIB_)\EmxSupport\ExDllSupport.lib \
+$(ODIN32_LIB_)\EmxSupport\m.lib \
+$(ODIN32_LIB)\kernel32.lib \
+$(ODIN32_LIB)\ntdll.lib \
+$(ODIN32_LIB)\user32.lib 
 
 #
@@ -69 +89 @@
 all: $(OBJDIR) $(OBJDIR)\$(TARGET).dll $(TARGET).lib
 
-$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def
-    $(LD) $(LDFLAGS) -Zso -Zsys $(OBJS) $(TARGET).def -L.\libs -lm\
-      -liberty_s -o $(OBJDIR)\$(TARGET).dll
-    touch $(OBJDIR)\$(TARGET).map
-    @echo "Illegal Sym File for EMX" > $(OBJDIR)\$(TARGET).sym
+$(TARGET).lib: 
+    implib $(OBJDIR)\$(TARGET).lib msvcrt.def
+    @copy $(OBJDIR)\$(TARGET).lib $(ODIN32_LIB_)\Release
+    @copy $(OBJDIR)\$(TARGET).lib $(ODIN32_LIB_)\Debug
 
 # Includes the common rules.
@@ -79 +98 @@
 !include $(ODIN32_POST_INC)
 
-$(TARGET).lib: 
-    implib $(OBJDIR)\$(TARGET).lib msvcrt.def
-    @copy $(OBJDIR)\$(TARGET).lib $(ODIN32_LIB_)\Release > nul:
-    @copy $(OBJDIR)\$(TARGET).lib $(ODIN32_LIB_)\Debug  > nul:
-
-lib: $(TARGET).lib