Undo previous checkin which was for v9_2 branch
This commit is contained in:
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libisccfg.dll"
|
||||
# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /machine:I386 /out:"../../../Build/Release/libisccfg.dll"
|
||||
|
||||
!ELSEIF "$(CFG)" == "libisccfg - Win32 Debug"
|
||||
|
||||
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccfg.dll" /pdbtype:sept
|
||||
# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /debug /machine:I386 /out:"../../../Build/Debug/libisccfg.dll" /pdbtype:sept
|
||||
|
||||
!ENDIF
|
||||
|
||||
@@ -94,10 +94,6 @@ LINK32=link.exe
|
||||
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\check.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=.\DLLMain.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@@ -40,16 +40,15 @@ ALL : "..\..\..\Build\Release\libisccfg.dll"
|
||||
|
||||
!ELSE
|
||||
|
||||
ALL : "libdns - Win32 Release" "libisc - Win32 Release" "..\..\..\Build\Release\libisccfg.dll"
|
||||
ALL : "libisc - Win32 Release" "..\..\..\Build\Release\libisccfg.dll"
|
||||
|
||||
!ENDIF
|
||||
|
||||
!IF "$(RECURSE)" == "1"
|
||||
CLEAN :"libisc - Win32 ReleaseCLEAN" "libdns - Win32 ReleaseCLEAN"
|
||||
CLEAN :"libisc - Win32 ReleaseCLEAN"
|
||||
!ELSE
|
||||
CLEAN :
|
||||
!ENDIF
|
||||
-@erase "$(INTDIR)\check.obj"
|
||||
-@erase "$(INTDIR)\DLLMain.obj"
|
||||
-@erase "$(INTDIR)\log.obj"
|
||||
-@erase "$(INTDIR)\parser.obj"
|
||||
@@ -69,17 +68,15 @@ BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccfg.bsc"
|
||||
BSC32_SBRS= \
|
||||
|
||||
LINK32=link.exe
|
||||
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib ../../dns/win32/Release/libdns.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisccfg.pdb" /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Release/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib"
|
||||
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libisccfg.pdb" /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Release/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib"
|
||||
DEF_FILE= \
|
||||
".\libisccfg.def"
|
||||
LINK32_OBJS= \
|
||||
"$(INTDIR)\check.obj" \
|
||||
"$(INTDIR)\DLLMain.obj" \
|
||||
"$(INTDIR)\log.obj" \
|
||||
"$(INTDIR)\parser.obj" \
|
||||
"$(INTDIR)\version.obj" \
|
||||
"..\..\isc\win32\Release\libisc.lib" \
|
||||
"..\..\dns\win32\Release\libdns.lib"
|
||||
"..\..\isc\win32\Release\libisc.lib"
|
||||
|
||||
"..\..\..\Build\Release\libisccfg.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
|
||||
$(LINK32) @<<
|
||||
@@ -100,17 +97,15 @@ ALL : "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"
|
||||
|
||||
!ELSE
|
||||
|
||||
ALL : "libdns - Win32 Debug" "libisc - Win32 Debug" "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"
|
||||
ALL : "libisc - Win32 Debug" "..\..\..\Build\Debug\libisccfg.dll" "$(OUTDIR)\libisccfg.bsc"
|
||||
|
||||
!ENDIF
|
||||
|
||||
!IF "$(RECURSE)" == "1"
|
||||
CLEAN :"libisc - Win32 DebugCLEAN" "libdns - Win32 DebugCLEAN"
|
||||
CLEAN :"libisc - Win32 DebugCLEAN"
|
||||
!ELSE
|
||||
CLEAN :
|
||||
!ENDIF
|
||||
-@erase "$(INTDIR)\check.obj"
|
||||
-@erase "$(INTDIR)\check.sbr"
|
||||
-@erase "$(INTDIR)\DLLMain.obj"
|
||||
-@erase "$(INTDIR)\DLLMain.sbr"
|
||||
-@erase "$(INTDIR)\log.obj"
|
||||
@@ -136,7 +131,6 @@ MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
BSC32=bscmake.exe
|
||||
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libisccfg.bsc"
|
||||
BSC32_SBRS= \
|
||||
"$(INTDIR)\check.sbr" \
|
||||
"$(INTDIR)\DLLMain.sbr" \
|
||||
"$(INTDIR)\log.sbr" \
|
||||
"$(INTDIR)\parser.sbr" \
|
||||
@@ -148,17 +142,15 @@ BSC32_SBRS= \
|
||||
<<
|
||||
|
||||
LINK32=link.exe
|
||||
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccfg.pdb" /debug /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Debug/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" /pdbtype:sept
|
||||
LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libisccfg.pdb" /debug /machine:I386 /def:".\libisccfg.def" /out:"../../../Build/Debug/libisccfg.dll" /implib:"$(OUTDIR)\libisccfg.lib" /pdbtype:sept
|
||||
DEF_FILE= \
|
||||
".\libisccfg.def"
|
||||
LINK32_OBJS= \
|
||||
"$(INTDIR)\check.obj" \
|
||||
"$(INTDIR)\DLLMain.obj" \
|
||||
"$(INTDIR)\log.obj" \
|
||||
"$(INTDIR)\parser.obj" \
|
||||
"$(INTDIR)\version.obj" \
|
||||
"..\..\isc\win32\Debug\libisc.lib" \
|
||||
"..\..\dns\win32\Debug\libdns.lib"
|
||||
"..\..\isc\win32\Debug\libisc.lib"
|
||||
|
||||
"..\..\..\Build\Debug\libisccfg.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
|
||||
$(LINK32) @<<
|
||||
@@ -208,24 +200,6 @@ LINK32_OBJS= \
|
||||
|
||||
|
||||
!IF "$(CFG)" == "libisccfg - Win32 Release" || "$(CFG)" == "libisccfg - Win32 Debug"
|
||||
SOURCE=..\check.c
|
||||
|
||||
!IF "$(CFG)" == "libisccfg - Win32 Release"
|
||||
|
||||
|
||||
"$(INTDIR)\check.obj" : $(SOURCE) "$(INTDIR)"
|
||||
$(CPP) $(CPP_PROJ) $(SOURCE)
|
||||
|
||||
|
||||
!ELSEIF "$(CFG)" == "libisccfg - Win32 Debug"
|
||||
|
||||
|
||||
"$(INTDIR)\check.obj" "$(INTDIR)\check.sbr" : $(SOURCE) "$(INTDIR)"
|
||||
$(CPP) $(CPP_PROJ) $(SOURCE)
|
||||
|
||||
|
||||
!ENDIF
|
||||
|
||||
SOURCE=.\DLLMain.c
|
||||
|
||||
!IF "$(CFG)" == "libisccfg - Win32 Release"
|
||||
@@ -297,55 +271,29 @@ SOURCE=.\version.c
|
||||
!IF "$(CFG)" == "libisccfg - Win32 Release"
|
||||
|
||||
"libisc - Win32 Release" :
|
||||
cd "\bind-9.2.1rc1\lib\isc\win32"
|
||||
cd "\bind-9.3.0a03\lib\isc\win32"
|
||||
$(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release"
|
||||
cd "..\..\isccfg\win32"
|
||||
|
||||
"libisc - Win32 ReleaseCLEAN" :
|
||||
cd "\bind-9.2.1rc1\lib\isc\win32"
|
||||
cd "\bind-9.3.0a03\lib\isc\win32"
|
||||
$(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Release" RECURSE=1 CLEAN
|
||||
cd "..\..\isccfg\win32"
|
||||
|
||||
!ELSEIF "$(CFG)" == "libisccfg - Win32 Debug"
|
||||
|
||||
"libisc - Win32 Debug" :
|
||||
cd "\bind-9.2.1rc1\lib\isc\win32"
|
||||
cd "\bind-9.3.0a03\lib\isc\win32"
|
||||
$(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug"
|
||||
cd "..\..\isccfg\win32"
|
||||
|
||||
"libisc - Win32 DebugCLEAN" :
|
||||
cd "\bind-9.2.1rc1\lib\isc\win32"
|
||||
cd "\bind-9.3.0a03\lib\isc\win32"
|
||||
$(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - Win32 Debug" RECURSE=1 CLEAN
|
||||
cd "..\..\isccfg\win32"
|
||||
|
||||
!ENDIF
|
||||
|
||||
!IF "$(CFG)" == "libisccfg - Win32 Release"
|
||||
|
||||
"libdns - Win32 Release" :
|
||||
cd "\bind-9.2.1rc1\lib\dns\win32"
|
||||
$(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release"
|
||||
cd "..\..\isccfg\win32"
|
||||
|
||||
"libdns - Win32 ReleaseCLEAN" :
|
||||
cd "\bind-9.2.1rc1\lib\dns\win32"
|
||||
$(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Release" RECURSE=1 CLEAN
|
||||
cd "..\..\isccfg\win32"
|
||||
|
||||
!ELSEIF "$(CFG)" == "libisccfg - Win32 Debug"
|
||||
|
||||
"libdns - Win32 Debug" :
|
||||
cd "\bind-9.2.1rc1\lib\dns\win32"
|
||||
$(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug"
|
||||
cd "..\..\isccfg\win32"
|
||||
|
||||
"libdns - Win32 DebugCLEAN" :
|
||||
cd "\bind-9.2.1rc1\lib\dns\win32"
|
||||
$(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - Win32 Debug" RECURSE=1 CLEAN
|
||||
cd "..\..\isccfg\win32"
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
||||
Reference in New Issue
Block a user