Remove \r\n in windows makefile.
This commit is contained in:
parent
63e39ab9a9
commit
9fbaf1d851
@ -1,64 +1,64 @@
|
|||||||
# Makefile for Microsoft Visual C++ 5.0 (or compat)
|
# Makefile for Microsoft Visual C++ 5.0 (or compat)
|
||||||
|
|
||||||
!IF "$(OS)" == "Windows_NT"
|
!IF "$(OS)" == "Windows_NT"
|
||||||
NULL=
|
NULL=
|
||||||
!ELSE
|
!ELSE
|
||||||
NULL=nul
|
NULL=nul
|
||||||
!ENDIF
|
!ENDIF
|
||||||
|
|
||||||
CPP=cl.exe
|
CPP=cl.exe
|
||||||
|
|
||||||
OUTDIR=.\Release
|
OUTDIR=.\Release
|
||||||
INTDIR=.\Release
|
INTDIR=.\Release
|
||||||
# Begin Custom Macros
|
# Begin Custom Macros
|
||||||
OutDir=.\Release
|
OutDir=.\Release
|
||||||
# End Custom Macros
|
# End Custom Macros
|
||||||
|
|
||||||
ALL : "$(OUTDIR)\psql.exe"
|
ALL : "$(OUTDIR)\psql.exe"
|
||||||
|
|
||||||
CLEAN :
|
CLEAN :
|
||||||
-@erase "$(INTDIR)\psql.obj"
|
-@erase "$(INTDIR)\psql.obj"
|
||||||
-@erase "$(INTDIR)\stringutils.obj"
|
-@erase "$(INTDIR)\stringutils.obj"
|
||||||
-@erase "$(INTDIR)\getopt.obj"
|
-@erase "$(INTDIR)\getopt.obj"
|
||||||
-@erase "$(INTDIR)\vc50.idb"
|
-@erase "$(INTDIR)\vc50.idb"
|
||||||
-@erase "$(OUTDIR)\psql.exe"
|
-@erase "$(OUTDIR)\psql.exe"
|
||||||
|
|
||||||
"$(OUTDIR)" :
|
"$(OUTDIR)" :
|
||||||
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
|
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
|
||||||
|
|
||||||
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
|
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
|
||||||
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
|
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
|
||||||
/I ..\..\include /I ..\..\interfaces\libpq
|
/I ..\..\include /I ..\..\interfaces\libpq
|
||||||
CPP_OBJS=.\Release/
|
CPP_OBJS=.\Release/
|
||||||
CPP_SBRS=.
|
CPP_SBRS=.
|
||||||
|
|
||||||
LINK32=link.exe
|
LINK32=link.exe
|
||||||
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
|
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
|
||||||
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
|
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
|
||||||
odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
|
odbccp32.lib wsock32.lib /nologo /subsystem:console /incremental:no\
|
||||||
/pdb:"$(OUTDIR)\psql.pdb" /machine:I386 /out:"$(OUTDIR)\psql.exe"
|
/pdb:"$(OUTDIR)\psql.pdb" /machine:I386 /out:"$(OUTDIR)\psql.exe"
|
||||||
LINK32_OBJS= \
|
LINK32_OBJS= \
|
||||||
"$(INTDIR)\psql.obj" \
|
"$(INTDIR)\psql.obj" \
|
||||||
"$(INTDIR)\stringutils.obj" \
|
"$(INTDIR)\stringutils.obj" \
|
||||||
"$(INTDIR)\getopt.obj" \
|
"$(INTDIR)\getopt.obj" \
|
||||||
"..\..\interfaces\libpq\Release\libpqdll.lib"
|
"..\..\interfaces\libpq\Release\libpqdll.lib"
|
||||||
|
|
||||||
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
|
"$(OUTDIR)\psql.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
|
||||||
$(LINK32) @<<
|
$(LINK32) @<<
|
||||||
$(LINK32_FLAGS) $(LINK32_OBJS)
|
$(LINK32_FLAGS) $(LINK32_OBJS)
|
||||||
<<
|
<<
|
||||||
|
|
||||||
"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\utils\getopt.c
|
"$(OUTDIR)\getopt.obj" : "$(OUTDIR)" ..\..\utils\getopt.c
|
||||||
$(CPP) @<<
|
$(CPP) @<<
|
||||||
$(CPP_PROJ) ..\..\utils\getopt.c
|
$(CPP_PROJ) ..\..\utils\getopt.c
|
||||||
<<
|
<<
|
||||||
|
|
||||||
.c{$(CPP_OBJS)}.obj::
|
.c{$(CPP_OBJS)}.obj::
|
||||||
$(CPP) @<<
|
$(CPP) @<<
|
||||||
$(CPP_PROJ) $<
|
$(CPP_PROJ) $<
|
||||||
<<
|
<<
|
||||||
|
|
||||||
.cpp{$(CPP_OBJS)}.obj::
|
.cpp{$(CPP_OBJS)}.obj::
|
||||||
$(CPP) @<<
|
$(CPP) @<<
|
||||||
$(CPP_PROJ) $<
|
$(CPP_PROJ) $<
|
||||||
<<
|
<<
|
||||||
|
Loading…
x
Reference in New Issue
Block a user