database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

The attached patch fixes win32.mak which got broken by the Multibyte mod

Browse Source 
:-(, and tidies it up a little as well.

Regards, Dave.
This commit is contained in:
Hiroshi Inoue
2001-03-21 16:26:17 +00:00
parent 34dba9c9c4
commit ff3c4896a9
1 changed files with 486 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/interfaces/odbc/win32.mak
View File

@ -4,8 +4,9 @@
# #
# Description: psqlodbc Makefile for Win32. # Description: psqlodbc Makefile for Win32.
# #
# Configurations: Debug, Release # Configurations: Debug, Release, MultibyteDebug, MultibyteRelease
# Build Types: ALL, CLEAN # Build Types: ALL, CLEAN
# Usage: NMAKE /f win32.mak CFG=[Release | Debug | MultibyteRelease | MultiByteDebug] [ALL | CLEAN]
# #
# Comments: Created by Dave Page, 2001-02-12 # Comments: Created by Dave Page, 2001-02-12
# #
@ -23,14 +24,16 @@ CFG=Release
!MESSAGE You can specify a configuration when running NMAKE !MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE !MESSAGE
!MESSAGE NMAKE /f win32.mak CFG=[Release | Debug | MultibyteRelease | MultiByteDebug] !MESSAGE NMAKE /f win32.mak CFG=[Release | Debug | MultibyteRelease | MultiByteDebug] [ALL | CLEAN]
!MESSAGE !MESSAGE
!MESSAGE Possible choices for configuration are: !MESSAGE Possible choices for configuration are:
!MESSAGE !MESSAGE
!MESSAGE "Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "Release" (Win32 Release DLL)
!MESSAGE "Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "Debug" (Win32 Debug DLL)
!MESSAGE "MultibyteRelease" (Win32 Release DLL with Multibyte support)
!MESSAGE "MultibyteDebug" (Win32 Release DLL with Multibyte support)
!MESSAGE !MESSAGE
!ERROR An invalid configuration is specified. !ERROR An invalid configuration was specified.
!ENDIF !ENDIF
!IF "$(OS)" == "Windows_NT" !IF "$(OS)" == "Windows_NT"
@ -41,11 +44,13 @@ NULL=nul
!IF "$(CFG)" == "Release" || "$(CFG)" == "MultibyteRelease" !IF "$(CFG)" == "Release" || "$(CFG)" == "MultibyteRelease"
!IF "$(CFG)" == "MultibyteRelease"
OUTDIR=.\MultibyteRelease
INTDIR=.\MultibyteRelease
!ELSE
OUTDIR=.\Release OUTDIR=.\Release
INTDIR=.\Release INTDIR=.\Release
# Begin Custom Macros !ENDIF
OutDir=.\Release
# End Custom Macros
ALL : "$(OUTDIR)\psqlodbc.dll" ALL : "$(OUTDIR)\psqlodbc.dll"
@ -63,7 +68,7 @@ CLEAN :
-@erase "$(INTDIR)\info.obj" -@erase "$(INTDIR)\info.obj"
-@erase "$(INTDIR)\lobj.obj" -@erase "$(INTDIR)\lobj.obj"
-@erase "$(INTDIR)\misc.obj" -@erase "$(INTDIR)\misc.obj"
!IF "$(CFG)" == "MultibyteRelease" || "$(CFG)" == "MultibyteDebug" !IF "$(CFG)" == "MultibyteRelease"
-@erase "$(INTDIR)\multibyte.obj" -@erase "$(INTDIR)\multibyte.obj"
!ENDIF !ENDIF
-@erase "$(INTDIR)\options.obj" -@erase "$(INTDIR)\options.obj"
@ -87,11 +92,12 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe CPP=cl.exe
!IF "$(CFG)" == "MultibyteRelease" || "$(CFG)" == "MultibyteDebug" !IF "$(CFG)" == "MultibyteRelease"
CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "MULTIBYTE" /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "MULTIBYTE" /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
!ELSE !ELSE
CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
!ENDIF !ENDIF
.c{$(INTDIR)}.obj:: .c{$(INTDIR)}.obj::
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) $< $(CPP_PROJ) $<
@ -102,7 +108,6 @@ CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
$(CPP_PROJ) $< $(CPP_PROJ) $<
<< <<
.cxx{$(INTDIR)}.obj:: .cxx{$(INTDIR)}.obj::
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) $< $(CPP_PROJ) $<
@ -147,7 +152,7 @@ LINK32_OBJS= \
"$(INTDIR)\info.obj" \ "$(INTDIR)\info.obj" \
"$(INTDIR)\lobj.obj" \ "$(INTDIR)\lobj.obj" \
"$(INTDIR)\misc.obj" \ "$(INTDIR)\misc.obj" \
!IF "$(CFG)" == "MultibyteRelease" || "$(CFG)" == "MultibyteDebug" !IF "$(CFG)" == "MultibyteRelease"
"$(INTDIR)\multibyte.obj" \ "$(INTDIR)\multibyte.obj" \
!ENDIF !ENDIF
"$(INTDIR)\options.obj" \ "$(INTDIR)\options.obj" \
@ -170,11 +175,13 @@ LINK32_OBJS= \
!ELSEIF "$(CFG)" == "Debug" || "$(CFG)" == "MultibyteDebug" !ELSEIF "$(CFG)" == "Debug" || "$(CFG)" == "MultibyteDebug"
!IF "$(CFG)" == "MultibyteDebug"
OUTDIR=.\MultibyteDebug
INTDIR=.\MultibyteDebug
!ELSE
OUTDIR=.\Debug OUTDIR=.\Debug
INTDIR=.\Debug INTDIR=.\Debug
# Begin Custom Macros !ENDIF
OutDir=.\Debug
# End Custom Macros
ALL : "$(OUTDIR)\psqlodbc.dll" ALL : "$(OUTDIR)\psqlodbc.dll"
@ -192,7 +199,7 @@ CLEAN :
-@erase "$(INTDIR)\info.obj" -@erase "$(INTDIR)\info.obj"
-@erase "$(INTDIR)\lobj.obj" -@erase "$(INTDIR)\lobj.obj"
-@erase "$(INTDIR)\misc.obj" -@erase "$(INTDIR)\misc.obj"
!IF "$(CFG)" == "MultibyteRelease" || "$(CFG)" == "MultibyteDebug" !IF "$(CFG)" == "MultibyteDebug"
-@erase "$(INTDIR)\multibyte.obj" -@erase "$(INTDIR)\multibyte.obj"
!ENDIF !ENDIF
-@erase "$(INTDIR)\options.obj" -@erase "$(INTDIR)\options.obj"
@ -219,11 +226,12 @@ CLEAN :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe CPP=cl.exe
!IF "$(CFG)" == "MultibyteRelease" || "$(CFG)" == "MultibyteDebug" !IF "$(CFG)" == "MultibyteDebug"
CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "MULTIBYTE" /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /D "MULTIBYTE" /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
!ELSE !ELSE
CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c CPP_PROJ=/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PSQLODBC_EXPORTS" /Fp"$(INTDIR)\psqlodbc.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
!ENDIF !ENDIF
.c{$(INTDIR)}.obj:: .c{$(INTDIR)}.obj::
$(CPP) @<< $(CPP) @<<
$(CPP_PROJ) $< $(CPP_PROJ) $<
@ -278,7 +286,7 @@ LINK32_OBJS= \
"$(INTDIR)\info.obj" \ "$(INTDIR)\info.obj" \
"$(INTDIR)\lobj.obj" \ "$(INTDIR)\lobj.obj" \
"$(INTDIR)\misc.obj" \ "$(INTDIR)\misc.obj" \
!IF "$(CFG)" == "MultibyteRelease" || "$(CFG)" == "MultibyteDebug" !IF "$(CFG)" == "MultibyteDebug"
"$(INTDIR)\multibyte.obj" \ "$(INTDIR)\multibyte.obj" \
!ENDIF !ENDIF
"$(INTDIR)\options.obj" \ "$(INTDIR)\options.obj" \
@ -324,7 +332,6 @@ SOURCE=connection.c
SOURCE=convert.c SOURCE=convert.c
"$(INTDIR)\convert.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\convert.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE) $(CPP) $(CPP_PROJ) $(SOURCE)
@ -375,14 +382,17 @@ SOURCE=misc.c
"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE) $(CPP) $(CPP_PROJ) $(SOURCE)
!IF "$(CFG)" == "MultibyteRelease" || "$(CFG)" == "MultibyteDebug" !IF "$(CFG)" == "MultibyteRelease" || "$(CFG)" == "MultibyteDebug"
SOURCE=multibyte.c SOURCE=multibyte.c
"$(INTDIR)\multibyte.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\multibyte.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE) $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF !ENDIF
SOURCE=options.c SOURCE=options.c
"$(INTDIR)\options.obj" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\options.obj" : $(SOURCE) "$(INTDIR)"
@ -409,29 +419,26 @@ SOURCE=psqlodbc.c
SOURCE=psqlodbc.rc SOURCE=psqlodbc.rc
!IF "$(CFG)" == "Release" || "$(CFG)" == "MultibyteRelease"
!IF "$(CFG)" == "Release" !IF "$(CFG)" == "Release"
"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
$(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "NDEBUG" $(SOURCE) $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "NDEBUG" $(SOURCE)
!ELSEIF "$(CFG)" == "MultibyteRelease" !ENDIF
!IF "$(CFG)" == "MultibyteRelease"
"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
$(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "NDEBUG" /d "MULTIBYTE" $(SOURCE) $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "NDEBUG" /d "MULTIBYTE" $(SOURCE)
!ENDIF !ENDIF
!ELSEIF "$(CFG)" == "Debug" || "$(CFG)" == "MultibyteDebug"
!IF "$(CFG)" == "Debug" !IF "$(CFG)" == "Debug"
"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
$(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "_DEBUG" $(SOURCE) $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "_DEBUG" $(SOURCE)
!ELSEIF "$(CFG)" == "MultibyteDebug" !ENDIF
!IF "$(CFG)" == "MultibyteDebug"
"$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)" "$(INTDIR)\psqlodbc.res" : $(SOURCE) "$(INTDIR)"
$(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "_DEBUG" /d "MULTIBYTE" $(SOURCE) $(RSC) /l 0x809 /fo"$(INTDIR)\psqlodbc.res" /d "_DEBUG" /d "MULTIBYTE" $(SOURCE)
!ENDIF !ENDIF
!ENDIF
SOURCE=qresult.c SOURCE=qresult.c