diff options
Diffstat (limited to 'MSVC/Tools/master.mak')
| -rw-r--r-- | MSVC/Tools/master.mak | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/MSVC/Tools/master.mak b/MSVC/Tools/master.mak index 07cf981..8d186b8 100644 --- a/MSVC/Tools/master.mak +++ b/MSVC/Tools/master.mak @@ -1,7 +1,3 @@ -!IFNDEF COMMONTOOLSPATH -!ERROR Env Variable COMMONTOOLSPATH must be defined -!ENDIF - #-------------------------------------------------------------------------- #needed so we can say foo.dll: foo.cpp and it will just work .SUFFIXES: .tlb .il .dll .cpp .js .cs .vb .rc .ocx .reg .resources .txt .resX .wsdl .asmx .lex @@ -18,7 +14,7 @@ _JS=jsc.exe _ASSEM=ilasm.exe # Comment this line out to turn debug mode off -DEBUG=TRUE +#DEBUG=TRUE #-------------------------------------------------------------------------- #Use the _MAKE_STOP environment variable if you want NMAKE to stop on error @@ -44,22 +40,18 @@ _AL=al.exe _SHAREDNAME=sn.exe _LEX=flex.exe -#IFDEF OS - -_MAKE_IN_DIR = $(COMMONTOOLSPATH)\MakInDir.bat - -#ELSE - _MAKE_IN_DIR = call "$(COMMONTOOLSPATH)\MakInDir.bat" -#ENDIF - _GACUTIL=gacutil.exe _WSDL=wsdl.exe _XSD=xsd.exe #define our basic link line for managed code +!IFDEF DEBUG _LINK=link.exe /INCREMENTAL /NOLOGO /DEBUG /SUBSYSTEM:CONSOLE /MACHINE:IX86 /NODEFAULTLIB:LIBC +!ELSE +_LINK=link.exe /INCREMENTAL /NOLOGO /SUBSYSTEM:CONSOLE /MACHINE:IX86 /NODEFAULTLIB:LIBCD +!ENDIF #this is used for compiling C# samples #reset this in individual sample makefile to your imports if required @@ -86,7 +78,11 @@ _CLEANFILES=*.obj *.tlb *.reg _CFLAGS=$(_CCFLAGS) /c /EHsc /D "_WINDOWS" /D "ZLIB_DLL" #set debug as the default for c++ +!IFDEF DEBUG _CDFLAGS=$(_CFLAGS) /Zi +!ELSE +_CDFLAGS=$(_CFLAGS) +!ENDIF #set some command link flags _LFLAGS=-noentry |