summaryrefslogtreecommitdiffabout
path: root/klog.mak
authorMichael Krelin <hacker@klever.net>2005-08-06 13:56:39 (UTC)
committer Michael Krelin <hacker@klever.net>2005-08-06 13:56:39 (UTC)
commit68b019775510758b3175e4a8fb5498fe8a30f88d (patch) (unidiff)
tree3198a2b7aeb41fed63b7e9b16a827013ede65cda /klog.mak
parentbdbe0e4fff764357d0bb6236f22d6f1dcc0548ba (diff)
downloadklog-master.zip
klog-master.tar.gz
klog-master.tar.bz2
fixed XP uninstall and prepared for 1.2 releaseHEAD1.2master
git-svn-id: http://svn.klever.net/kin/klog/trunk@136 fe716a7a-6dde-0310-88d9-d003556173a8
Diffstat (limited to 'klog.mak') (more/less context) (ignore whitespace changes)
-rw-r--r--klog.mak20
1 files changed, 16 insertions, 4 deletions
diff --git a/klog.mak b/klog.mak
index 323d0a4..96fe85a 100644
--- a/klog.mak
+++ b/klog.mak
@@ -1105,147 +1105,159 @@ DEP_CPP_WARNB=\
1105 1105
1106 1106
1107!IF "$(CFG)" == "KLog - Win32 Release" 1107!IF "$(CFG)" == "KLog - Win32 Release"
1108 1108
1109 1109
1110"$(INTDIR)\WarnBlocking.obj" : $(SOURCE) $(DEP_CPP_WARNB) "$(INTDIR)"\ 1110"$(INTDIR)\WarnBlocking.obj" : $(SOURCE) $(DEP_CPP_WARNB) "$(INTDIR)"\
1111 "$(INTDIR)\klog.pch" 1111 "$(INTDIR)\klog.pch"
1112 1112
1113 1113
1114!ELSEIF "$(CFG)" == "KLog - Win32 Debug" 1114!ELSEIF "$(CFG)" == "KLog - Win32 Debug"
1115 1115
1116 1116
1117"$(INTDIR)\WarnBlocking.obj" : $(SOURCE) $(DEP_CPP_WARNB) "$(INTDIR)"\ 1117"$(INTDIR)\WarnBlocking.obj" : $(SOURCE) $(DEP_CPP_WARNB) "$(INTDIR)"\
1118 "$(INTDIR)\klog.pch" 1118 "$(INTDIR)\klog.pch"
1119 1119
1120 1120
1121!ELSEIF "$(CFG)" == "KLog - Win32 Static Release" 1121!ELSEIF "$(CFG)" == "KLog - Win32 Static Release"
1122 1122
1123 1123
1124"$(INTDIR)\WarnBlocking.obj" : $(SOURCE) $(DEP_CPP_WARNB) "$(INTDIR)"\ 1124"$(INTDIR)\WarnBlocking.obj" : $(SOURCE) $(DEP_CPP_WARNB) "$(INTDIR)"\
1125 "$(INTDIR)\klog.pch" 1125 "$(INTDIR)\klog.pch"
1126 1126
1127 1127
1128!ENDIF 1128!ENDIF
1129 1129
1130# End Source File 1130# End Source File
1131# End Target 1131# End Target
1132################################################################################ 1132################################################################################
1133# Begin Target 1133# Begin Target
1134 1134
1135# Name "Install - Win32 Debug" 1135# Name "Install - Win32 Debug"
1136# Name "Install - Win32 Pure" 1136# Name "Install - Win32 Pure"
1137# Name "Install - Win32 Canned" 1137# Name "Install - Win32 Canned"
1138# Name "Install - Win32 Static" 1138# Name "Install - Win32 Static"
1139 1139
1140!IF "$(CFG)" == "Install - Win32 Debug" 1140!IF "$(CFG)" == "Install - Win32 Debug"
1141 1141
1142!ELSEIF "$(CFG)" == "Install - Win32 Pure" 1142!ELSEIF "$(CFG)" == "Install - Win32 Pure"
1143 1143
1144!ELSEIF "$(CFG)" == "Install - Win32 Canned" 1144!ELSEIF "$(CFG)" == "Install - Win32 Canned"
1145 1145
1146!ELSEIF "$(CFG)" == "Install - Win32 Static" 1146!ELSEIF "$(CFG)" == "Install - Win32 Static"
1147 1147
1148!ENDIF 1148!ENDIF
1149 1149
1150################################################################################ 1150################################################################################
1151# Begin Source File 1151# Begin Source File
1152 1152
1153SOURCE=.\Install\Install.rc 1153SOURCE=.\Install\Install.rc
1154DEP_RSC_INSTA=\ 1154DEP_RSC_INSTA=\
1155 ".\Install\custom.rch"\ 1155 ".\Install\custom.rch"\
1156 ".\shared-data\install-icon.ico"\ 1156 ".\shared-data\install-icon.ico"\
1157 1157
1158 1158
1159!IF "$(CFG)" == "Install - Win32 Debug" 1159!IF "$(CFG)" == "Install - Win32 Debug"
1160 1160
1161 1161
1162"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)" 1162"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
1163 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "_DEBUG" /d\ 1163 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "_DEBUG" /d\
1164 "_AFXDLL" $(SOURCE) 1164 "_AFXDLL" $(SOURCE)
1165 1165
1166 1166
1167!ELSEIF "$(CFG)" == "Install - Win32 Pure" 1167!ELSEIF "$(CFG)" == "Install - Win32 Pure"
1168 1168
1169 1169
1170"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)" 1170"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
1171 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\ 1171 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\
1172 "_AFXDLL" $(SOURCE) 1172 "_AFXDLL" $(SOURCE)
1173 1173
1174 1174
1175!ELSEIF "$(CFG)" == "Install - Win32 Canned" 1175!ELSEIF "$(CFG)" == "Install - Win32 Canned"
1176 1176
1177 1177
1178"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)" 1178"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
1179 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\ 1179 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\
1180 "_AFXDLL" /d "K_ANNED" $(SOURCE) 1180 "_AFXDLL" /d "K_ANNED" $(SOURCE)
1181 1181
1182 1182
1183!ELSEIF "$(CFG)" == "Install - Win32 Static" 1183!ELSEIF "$(CFG)" == "Install - Win32 Static"
1184 1184
1185 1185
1186"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)" 1186"$(INTDIR)\Install.res" : $(SOURCE) $(DEP_RSC_INSTA) "$(INTDIR)"
1187 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\ 1187 $(RSC) /l 0x409 /fo"$(INTDIR)/Install.res" /i "Install" /d "NDEBUG" /d\
1188 "_AFXDLL" /d "STATI_K" $(SOURCE) 1188 "_AFXDLL" /d "STATI_K" $(SOURCE)
1189 1189
1190 1190
1191!ENDIF 1191!ENDIF
1192 1192
1193# End Source File 1193# End Source File
1194################################################################################ 1194################################################################################
1195# Begin Source File 1195# Begin Source File
1196 1196
1197SOURCE=.\Install\install.cpp 1197SOURCE=.\Install\install.cpp
1198 1198
1199!IF "$(CFG)" == "Install - Win32 Debug" 1199!IF "$(CFG)" == "Install - Win32 Debug"
1200 1200
1201DEP_CPP_INSTAL=\
1202 ".\shared-code\install.h"\
1203
1201 1204
1202"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)" 1205"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
1203 $(CPP) $(CPP_PROJ) $(SOURCE) 1206 $(CPP) $(CPP_PROJ) $(SOURCE)
1204 1207
1205 1208
1206!ELSEIF "$(CFG)" == "Install - Win32 Pure" 1209!ELSEIF "$(CFG)" == "Install - Win32 Pure"
1207 1210
1211DEP_CPP_INSTAL=\
1212 ".\shared-code\install.h"\
1213
1208 1214
1209"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)" 1215"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
1210 $(CPP) $(CPP_PROJ) $(SOURCE) 1216 $(CPP) $(CPP_PROJ) $(SOURCE)
1211 1217
1212 1218
1213!ELSEIF "$(CFG)" == "Install - Win32 Canned" 1219!ELSEIF "$(CFG)" == "Install - Win32 Canned"
1214 1220
1221DEP_CPP_INSTAL=\
1222 ".\shared-code\install.h"\
1223
1215 1224
1216"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)" 1225"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
1217 $(CPP) $(CPP_PROJ) $(SOURCE) 1226 $(CPP) $(CPP_PROJ) $(SOURCE)
1218 1227
1219 1228
1220!ELSEIF "$(CFG)" == "Install - Win32 Static" 1229!ELSEIF "$(CFG)" == "Install - Win32 Static"
1221 1230
1231DEP_CPP_INSTAL=\
1232 ".\shared-code\install.h"\
1233
1222 1234
1223"$(INTDIR)\install.obj" : $(SOURCE) "$(INTDIR)" 1235"$(INTDIR)\install.obj" : $(SOURCE) $(DEP_CPP_INSTAL) "$(INTDIR)"
1224 $(CPP) $(CPP_PROJ) $(SOURCE) 1236 $(CPP) $(CPP_PROJ) $(SOURCE)
1225 1237
1226 1238
1227!ENDIF 1239!ENDIF
1228 1240
1229# End Source File 1241# End Source File
1230################################################################################ 1242################################################################################
1231# Begin Project Dependency 1243# Begin Project Dependency
1232 1244
1233# Project_Dep_Name "KLog" 1245# Project_Dep_Name "KLog"
1234 1246
1235!IF "$(CFG)" == "Install - Win32 Debug" 1247!IF "$(CFG)" == "Install - Win32 Debug"
1236 1248
1237"KLog - Win32 Debug" : 1249"KLog - Win32 Debug" :
1238 $(MAKE) /$(MAKEFLAGS) /F ".\klog.mak" CFG="KLog - Win32 Debug" 1250 $(MAKE) /$(MAKEFLAGS) /F ".\klog.mak" CFG="KLog - Win32 Debug"
1239 1251
1240!ELSEIF "$(CFG)" == "Install - Win32 Pure" 1252!ELSEIF "$(CFG)" == "Install - Win32 Pure"
1241 1253
1242!ELSEIF "$(CFG)" == "Install - Win32 Canned" 1254!ELSEIF "$(CFG)" == "Install - Win32 Canned"
1243 1255
1244!ELSEIF "$(CFG)" == "Install - Win32 Static" 1256!ELSEIF "$(CFG)" == "Install - Win32 Static"
1245 1257
1246!ENDIF 1258!ENDIF
1247 1259
1248# End Project Dependency 1260# End Project Dependency
1249# End Target 1261# End Target
1250# End Project 1262# End Project
1251################################################################################ 1263################################################################################