|
diff --git a/klog.mak b/klog.mak index 23ac3fe..323d0a4 100644 --- a/ klog.mak+++ b/ klog.mak |
|
@@ -71,9 +71,9 @@ CLEAN : |
71 | -@erase "$(INTDIR)\klog.hl_"
|
71 | -@erase "$(INTDIR)\klog.hl_"
|
72 | -@erase "$(INTDIR)\klog.hlp"
|
72 | -@erase "$(INTDIR)\klog.hlp"
|
73 | -@erase "$(INTDIR)\KLog.obj"
|
73 | -@erase "$(INTDIR)\KLog.obj"
|
74 | -@erase "$(INTDIR)\klog.pch"
|
74 | -@erase "$(INTDIR)\klog.pch"
|
75 | -@erase "$(INTDIR)\KLog.res"
|
75 | -@erase "$(INTDIR)\klog.res"
|
76 | -@erase "$(INTDIR)\KLogDlg.obj"
|
76 | -@erase "$(INTDIR)\KLogDlg.obj"
|
77 | -@erase "$(INTDIR)\LogPattern.obj"
|
77 | -@erase "$(INTDIR)\LogPattern.obj"
|
78 | -@erase "$(INTDIR)\LogPatternLocal.obj"
|
78 | -@erase "$(INTDIR)\LogPatternLocal.obj"
|
79 | -@erase "$(INTDIR)\LogPatternReserved.obj"
|
79 | -@erase "$(INTDIR)\LogPatternReserved.obj"
|
@@ -98,9 +98,9 @@ CPP_SBRS=.\. |
98 | # ADD MTL /nologo /D "NDEBUG" /win32
|
98 | # ADD MTL /nologo /D "NDEBUG" /win32
|
99 | MTL_PROJ=/nologo /D "NDEBUG" /win32
|
99 | MTL_PROJ=/nologo /D "NDEBUG" /win32
|
100 | # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
|
100 | # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
|
101 | # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
|
101 | # ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
|
102 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KLog.res" /d "NDEBUG" /d "_AFXDLL"
|
102 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/klog.res" /d "NDEBUG" /d "_AFXDLL"
|
103 | BSC32=bscmake.exe
|
103 | BSC32=bscmake.exe
|
104 | # ADD BASE BSC32 /nologo
|
104 | # ADD BASE BSC32 /nologo
|
105 | # ADD BSC32 /nologo
|
105 | # ADD BSC32 /nologo
|
106 | BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
|
106 | BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
|
@@ -112,9 +112,9 @@ LINK32=link.exe |
112 | LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
|
112 | LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
|
113 | /pdb:"$(OUTDIR)/klog.pdb" /machine:I386 /out:"$(OUTDIR)/klog.exe"
|
113 | /pdb:"$(OUTDIR)/klog.pdb" /machine:I386 /out:"$(OUTDIR)/klog.exe"
|
114 | LINK32_OBJS= \
|
114 | LINK32_OBJS= \
|
115 | "$(INTDIR)\KLog.obj" \
|
115 | "$(INTDIR)\KLog.obj" \
|
116 | "$(INTDIR)\KLog.res" \
|
116 | "$(INTDIR)\klog.res" \
|
117 | "$(INTDIR)\KLogDlg.obj" \
|
117 | "$(INTDIR)\KLogDlg.obj" \
|
118 | "$(INTDIR)\LogPattern.obj" \
|
118 | "$(INTDIR)\LogPattern.obj" \
|
119 | "$(INTDIR)\LogPatternLocal.obj" \
|
119 | "$(INTDIR)\LogPatternLocal.obj" \
|
120 | "$(INTDIR)\LogPatternReserved.obj" \
|
120 | "$(INTDIR)\LogPatternReserved.obj" \
|
@@ -168,9 +168,9 @@ CLEAN : |
168 | -@erase "$(INTDIR)\klog.hl_"
|
168 | -@erase "$(INTDIR)\klog.hl_"
|
169 | -@erase "$(INTDIR)\klog.hlp"
|
169 | -@erase "$(INTDIR)\klog.hlp"
|
170 | -@erase "$(INTDIR)\KLog.obj"
|
170 | -@erase "$(INTDIR)\KLog.obj"
|
171 | -@erase "$(INTDIR)\klog.pch"
|
171 | -@erase "$(INTDIR)\klog.pch"
|
172 | -@erase "$(INTDIR)\KLog.res"
|
172 | -@erase "$(INTDIR)\klog.res"
|
173 | -@erase "$(INTDIR)\KLogDlg.obj"
|
173 | -@erase "$(INTDIR)\KLogDlg.obj"
|
174 | -@erase "$(INTDIR)\LogPattern.obj"
|
174 | -@erase "$(INTDIR)\LogPattern.obj"
|
175 | -@erase "$(INTDIR)\LogPatternLocal.obj"
|
175 | -@erase "$(INTDIR)\LogPatternLocal.obj"
|
176 | -@erase "$(INTDIR)\LogPatternReserved.obj"
|
176 | -@erase "$(INTDIR)\LogPatternReserved.obj"
|
@@ -200,9 +200,9 @@ CPP_SBRS=.\. |
200 | # ADD MTL /nologo /D "_DEBUG" /win32
|
200 | # ADD MTL /nologo /D "_DEBUG" /win32
|
201 | MTL_PROJ=/nologo /D "_DEBUG" /win32
|
201 | MTL_PROJ=/nologo /D "_DEBUG" /win32
|
202 | # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
|
202 | # ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
|
203 | # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
|
203 | # ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
|
204 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KLog.res" /d "_DEBUG" /d "_AFXDLL"
|
204 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/klog.res" /d "_DEBUG" /d "_AFXDLL"
|
205 | BSC32=bscmake.exe
|
205 | BSC32=bscmake.exe
|
206 | # ADD BASE BSC32 /nologo
|
206 | # ADD BASE BSC32 /nologo
|
207 | # ADD BSC32 /nologo
|
207 | # ADD BSC32 /nologo
|
208 | BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
|
208 | BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
|
@@ -214,9 +214,9 @@ LINK32=link.exe |
214 | LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes\
|
214 | LINK32_FLAGS=/nologo /subsystem:windows /incremental:yes\
|
215 | /pdb:"$(OUTDIR)/klog.pdb" /debug /machine:I386 /out:"$(OUTDIR)/klog.exe"
|
215 | /pdb:"$(OUTDIR)/klog.pdb" /debug /machine:I386 /out:"$(OUTDIR)/klog.exe"
|
216 | LINK32_OBJS= \
|
216 | LINK32_OBJS= \
|
217 | "$(INTDIR)\KLog.obj" \
|
217 | "$(INTDIR)\KLog.obj" \
|
218 | "$(INTDIR)\KLog.res" \
|
218 | "$(INTDIR)\klog.res" \
|
219 | "$(INTDIR)\KLogDlg.obj" \
|
219 | "$(INTDIR)\KLogDlg.obj" \
|
220 | "$(INTDIR)\LogPattern.obj" \
|
220 | "$(INTDIR)\LogPattern.obj" \
|
221 | "$(INTDIR)\LogPatternLocal.obj" \
|
221 | "$(INTDIR)\LogPatternLocal.obj" \
|
222 | "$(INTDIR)\LogPatternReserved.obj" \
|
222 | "$(INTDIR)\LogPatternReserved.obj" \
|
@@ -260,19 +260,19 @@ INTDIR=.\Releast |
260 | OutDir=.\Releast
|
260 | OutDir=.\Releast
|
261 | TargetName=klog
|
261 | TargetName=klog
|
262 | # End Custom Macros
|
262 | # End Custom Macros
|
263 |
|
263 |
|
264 | ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.hlp" "$(OUTDIR)\klog.cnt"\
|
264 | ALL : "$(OUTDIR)\klog.exe" "$(OUTDIR)\klog.ex_" "$(OUTDIR)\klog.hlp"\
|
265 | "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_" "$(OUTDIR)\klog.ex_"
|
265 | "$(OUTDIR)\klog.cnt" "$(OUTDIR)\klog.hl_" "$(OUTDIR)\klog.cn_"
|
266 |
|
266 |
|
267 | CLEAN :
|
267 | CLEAN :
|
268 | -@erase "$(INTDIR)\klog.cn_"
|
268 | -@erase "$(INTDIR)\klog.cn_"
|
269 | -@erase "$(INTDIR)\klog.cnt"
|
269 | -@erase "$(INTDIR)\klog.cnt"
|
270 | -@erase "$(INTDIR)\klog.hl_"
|
270 | -@erase "$(INTDIR)\klog.hl_"
|
271 | -@erase "$(INTDIR)\klog.hlp"
|
271 | -@erase "$(INTDIR)\klog.hlp"
|
272 | -@erase "$(INTDIR)\KLog.obj"
|
272 | -@erase "$(INTDIR)\KLog.obj"
|
273 | -@erase "$(INTDIR)\klog.pch"
|
273 | -@erase "$(INTDIR)\klog.pch"
|
274 | -@erase "$(INTDIR)\KLog.res"
|
274 | -@erase "$(INTDIR)\klog.res"
|
275 | -@erase "$(INTDIR)\KLogDlg.obj"
|
275 | -@erase "$(INTDIR)\KLogDlg.obj"
|
276 | -@erase "$(INTDIR)\LogPattern.obj"
|
276 | -@erase "$(INTDIR)\LogPattern.obj"
|
277 | -@erase "$(INTDIR)\LogPatternLocal.obj"
|
277 | -@erase "$(INTDIR)\LogPatternLocal.obj"
|
278 | -@erase "$(INTDIR)\LogPatternReserved.obj"
|
278 | -@erase "$(INTDIR)\LogPatternReserved.obj"
|
@@ -297,9 +297,9 @@ CPP_SBRS=.\. |
297 | # ADD MTL /nologo /D "NDEBUG" /win32
|
297 | # ADD MTL /nologo /D "NDEBUG" /win32
|
298 | MTL_PROJ=/nologo /D "NDEBUG" /win32
|
298 | MTL_PROJ=/nologo /D "NDEBUG" /win32
|
299 | # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
|
299 | # ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
|
300 | # ADD RSC /l 0x409 /d "NDEBUG"
|
300 | # ADD RSC /l 0x409 /d "NDEBUG"
|
301 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/KLog.res" /d "NDEBUG"
|
301 | RSC_PROJ=/l 0x409 /fo"$(INTDIR)/klog.res" /d "NDEBUG"
|
302 | BSC32=bscmake.exe
|
302 | BSC32=bscmake.exe
|
303 | # ADD BASE BSC32 /nologo
|
303 | # ADD BASE BSC32 /nologo
|
304 | # ADD BSC32 /nologo
|
304 | # ADD BSC32 /nologo
|
305 | BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
|
305 | BSC32_FLAGS=/nologo /o"$(OUTDIR)/klog.bsc"
|
@@ -311,9 +311,9 @@ LINK32=link.exe |
311 | LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
|
311 | LINK32_FLAGS=/nologo /subsystem:windows /incremental:no\
|
312 | /pdb:"$(OUTDIR)/klog.pdb" /machine:I386 /out:"$(OUTDIR)/klog.exe"
|
312 | /pdb:"$(OUTDIR)/klog.pdb" /machine:I386 /out:"$(OUTDIR)/klog.exe"
|
313 | LINK32_OBJS= \
|
313 | LINK32_OBJS= \
|
314 | "$(INTDIR)\KLog.obj" \
|
314 | "$(INTDIR)\KLog.obj" \
|
315 | "$(INTDIR)\KLog.res" \
|
315 | "$(INTDIR)\klog.res" \
|
316 | "$(INTDIR)\KLogDlg.obj" \
|
316 | "$(INTDIR)\KLogDlg.obj" \
|
317 | "$(INTDIR)\LogPattern.obj" \
|
317 | "$(INTDIR)\LogPattern.obj" \
|
318 | "$(INTDIR)\LogPatternLocal.obj" \
|
318 | "$(INTDIR)\LogPatternLocal.obj" \
|
319 | "$(INTDIR)\LogPatternReserved.obj" \
|
319 | "$(INTDIR)\LogPatternReserved.obj" \
|
@@ -768,23 +768,23 @@ DEP_RSC_KLOG_R=\ |
768 |
|
768 |
|
769 | !IF "$(CFG)" == "KLog - Win32 Release"
|
769 | !IF "$(CFG)" == "KLog - Win32 Release"
|
770 |
|
770 |
|
771 |
|
771 |
|
772 | "$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
|
772 | "$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
|
773 | $(RSC) $(RSC_PROJ) $(SOURCE)
|
773 | $(RSC) $(RSC_PROJ) $(SOURCE)
|
774 |
|
774 |
|
775 |
|
775 |
|
776 | !ELSEIF "$(CFG)" == "KLog - Win32 Debug"
|
776 | !ELSEIF "$(CFG)" == "KLog - Win32 Debug"
|
777 |
|
777 |
|
778 |
|
778 |
|
779 | "$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
|
779 | "$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
|
780 | $(RSC) $(RSC_PROJ) $(SOURCE)
|
780 | $(RSC) $(RSC_PROJ) $(SOURCE)
|
781 |
|
781 |
|
782 |
|
782 |
|
783 | !ELSEIF "$(CFG)" == "KLog - Win32 Static Release"
|
783 | !ELSEIF "$(CFG)" == "KLog - Win32 Static Release"
|
784 |
|
784 |
|
785 |
|
785 |
|
786 | "$(INTDIR)\KLog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
|
786 | "$(INTDIR)\klog.res" : $(SOURCE) $(DEP_RSC_KLOG_R) "$(INTDIR)"
|
787 | $(RSC) $(RSC_PROJ) $(SOURCE)
|
787 | $(RSC) $(RSC_PROJ) $(SOURCE)
|
788 |
|
788 |
|
789 |
|
789 |
|
790 | !ENDIF
|
790 | !ENDIF
|
@@ -1194,37 +1194,34 @@ DEP_RSC_INSTA=\ |
1194 | ################################################################################
|
1194 | ################################################################################
|
1195 | # Begin Source File
|
1195 | # Begin Source File
|
1196 |
|
1196 |
|
1197 | SOURCE=.\Install\install.cpp
|
1197 | SOURCE=.\Install\install.cpp
|
1198 | DEP_CPP_INSTAL=\
|
| |
1199 | ".\shared-code\install.h"\
|
| |
1200 |
|
| |
1201 |
|
1198 |
|
1202 | !IF "$(CFG)" == "Install - Win32 Debug"
|
1199 | !IF "$(CFG)" == "Install - Win32 Debug"
|
1203 |
|
1200 |
|
1204 |
|
1201 |
|
1205 | "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
|
1202 | "$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
|
1206 | $(CPP) $(CPP_PROJ) $(SOURCE)
|
1203 | $(CPP) $(CPP_PROJ) $(SOURCE)
|
1207 |
|
1204 |
|
1208 |
|
1205 |
|
1209 | !ELSEIF "$(CFG)" == "Install - Win32 Pure"
|
1206 | !ELSEIF "$(CFG)" == "Install - Win32 Pure"
|
1210 |
|
1207 |
|
1211 |
|
1208 |
|
1212 | "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
|
1209 | "$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
|
1213 | $(CPP) $(CPP_PROJ) $(SOURCE)
|
1210 | $(CPP) $(CPP_PROJ) $(SOURCE)
|
1214 |
|
1211 |
|
1215 |
|
1212 |
|
1216 | !ELSEIF "$(CFG)" == "Install - Win32 Canned"
|
1213 | !ELSEIF "$(CFG)" == "Install - Win32 Canned"
|
1217 |
|
1214 |
|
1218 |
|
1215 |
|
1219 | "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
|
1216 | "$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
|
1220 | $(CPP) $(CPP_PROJ) $(SOURCE)
|
1217 | $(CPP) $(CPP_PROJ) $(SOURCE)
|
1221 |
|
1218 |
|
1222 |
|
1219 |
|
1223 | !ELSEIF "$(CFG)" == "Install - Win32 Static"
|
1220 | !ELSEIF "$(CFG)" == "Install - Win32 Static"
|
1224 |
|
1221 |
|
1225 |
|
1222 |
|
1226 | "$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
|
1223 | "$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)"
|
1227 | $(CPP) $(CPP_PROJ) $(SOURCE)
|
1224 | $(CPP) $(CPP_PROJ) $(SOURCE)
|
1228 |
|
1225 |
|
1229 |
|
1226 |
|
1230 | !ENDIF
|
1227 | !ENDIF
|
|