Updated makefiles to use flags that are common in both 2003 and 2005, replaced the...

git-svn-id: https://buildtools.tianocore.org/svn/buildtools/trunk/BaseTools@860 7335b38e-4728-0410-8992-fb3ffe349368

diff --git a/Source/C/MSmakefile.app b/Source/C/MSmakefile.app
index 014a462..eceacbb 100644 (file)
--- a/Source/C/MSmakefile.app
+++ b/Source/C/MSmakefile.app
@@ -6,7 +6,7 @@ all: $(APPLICATION)
 
 $(APPLICATION) : $(OBJECTS) 
        -@if not exist $(BIN_PATH) mkdir $(BIN_PATH)
-       $(LD) /nologo /debug /incremental:no /nodefaultlib:libc.lib /out:$@ /libpath:$(LIB_PATH) $(LIBS) $**
+       $(LD) /nologo /debug /incremental:no /nodefaultlib:libc.lib /out:$@ $(LIBS) $**
 
 .PHONY:clean
 .PHONY:cleanall

diff --git a/Source/C/MSmakefile.common b/Source/C/MSmakefile.common
index fd6b786..24b4960 100644 (file)
--- a/Source/C/MSmakefile.common
+++ b/Source/C/MSmakefile.common
@@ -44,6 +44,6 @@ LINKER = $(LD)
 
 INC = -I . -I $(SOURCE_PATH)\Include -I $(ARCH_INCLUDE) -I $(SOURCE_PATH)\Common $(INC)
 
-CFLAGS = $(CFLAGS) /nologo /c /Zi /Od /GZ /D_DEBUG /MLd
-CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /c /Zi /Od /GZ /D_DEBUG /MLd
+CFLAGS = $(CFLAGS) /nologo /c /Zi /Od /RTC1 /D _DEBUG /MTd /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE 
+CPPFLAGS = $(CPPFLAGS) /EHsc /nologo /c /Zi /Od /RTC1 /D _DEBUG /MTd /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE 
 

diff --git a/Source/C/MSmakefile.rule b/Source/C/MSmakefile.rule
index a2f420b..94687a0 100644 (file)
--- a/Source/C/MSmakefile.rule
+++ b/Source/C/MSmakefile.rule
@@ -1,13 +1,13 @@
 #DEPFILES = $(OBJECTS:%.o=%.d)
 
 .c.obj :
-       $(CC) -c $(CFLAGS) $(INC) $< -o $@
+       $(CC) -c $(CFLAGS) $(INC) $< -Fo$@
 
 .S.obj :
-       $(AS) -c $(ASFLAGS) $< -o $@
+       $(AS) -c $(ASFLAGS) $< -Fo$@
 
 .cpp.obj :
-       $(CXX) -c $(CPPFLAGS) $(INC) $< -o $@
+       $(CXX) -c $(CPPFLAGS) $(INC) $< -Fo$@
 
 #-include $(DEPFILES)
 

diff --git a/Source/C/app.makefile b/Source/C/app.makefile
index 9c219d8..6e316c4 100644 (file)
--- a/Source/C/app.makefile
+++ b/Source/C/app.makefile
@@ -8,6 +8,6 @@ APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
 all: $(MAKEROOT)/bin $(APPLICATION) 
 
 $(APPLICATION): $(OBJECTS) 
-       $(LINKER) -o $(APPLICATION) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)
+       $(LINKER) -out:$(APPLICATION) $(OBJECTS) -L$(MAKEROOT)/libs $(LIBS)
 
 include $(MAKEROOT)/footer.makefile

diff --git a/Source/C/footer.makefile b/Source/C/footer.makefile
index 7bdf49c..028299d 100644 (file)
--- a/Source/C/footer.makefile
+++ b/Source/C/footer.makefile
@@ -11,10 +11,10 @@ $(LIBRARY): $(OBJECTS)
        $(AR) crs $@ $^
 
 %.o : %.c 
-       $(CC)  -c $(CFLAGS) $(CPPFLAGS) $< -o $@
+       $(CC)  -c $(CFLAGS) $(CPPFLAGS) $< -Fo$@
 
 %.o : %.S
-       $(AS) -c $(ASFLAGS) $< -o $@
+       $(AS) -c $(ASFLAGS) $< -out:$@
 
 .PHONY: clean
 clean: