Changeset 4804 for trunk/tools

Timestamp:

Dec 16, 2000, 9:10:09 PM (25 years ago)

Author:

bird

Message:

Prepared for build level info.

Location:

trunk/tools

Files:

• SDF/sdf.def (added)
• bin/MakeBldLevelInfo.cmd (added)
• common/common.mak (modified) (2 diffs)
• common/common.mk (modified) (2 diffs)
• common/kDef2Wat.def (added)
• common/kDump.def (added)
• common/kFileDef.cpp (modified) (1 diff)
• common/makefile (modified) (6 diffs)
• database/Makefile (modified) (2 diffs)
• fastdep/fastdep.def (added)
• impdef/ImpDef.def (added)
• install/odininst.def (added)
• regedit/regedit.def (added)

trunk/tools/common/common.mak

@@ -1 @@
-# $Id: common.mak,v 1.2 2000-12-02 23:26:57 bird Exp $
+# $Id: common.mak,v 1.3 2000-12-16 20:10:07 bird Exp $
 
 #
@@ -19 +19 @@
 #
 !include ../../makefile.inc
+
+
+#
+# We use exception, so we'll have to enable them.
+#
+!ifndef WAT
+CXXFLAGS = $(CXXFLAGS) $(CXXEXCEPTIONS)
+!else
+CXXFLAGS += $(CXXEXCEPTIONS)
+!endif
 
 

trunk/tools/common/common.mk

@@ -1 @@
-# $Id: common.mk,v 1.4 2000-12-02 23:26:57 bird Exp $
+# $Id: common.mk,v 1.5 2000-12-16 20:10:07 bird Exp $
 #
 # Common definitions for tools.
@@ -11 +11 @@
 # Project Odin Software License can be found in LICENSE.TXT
 #
+
+
+#
+# We use exception, so we'll have to enable them.
+#
+!ifndef WAT
+CXXFLAGS = $(CXXFLAGS) $(CXXEXCEPTIONS)
+!else
+CXXFLAGS += $(CXXEXCEPTIONS)
+!endif
 
 

trunk/tools/common/kFileDef.cpp

@@ -9 +9 @@
 *   Defined Constants                                                          *
 *******************************************************************************/
-#define StringCase(psz, pszMatch) (strnicmp(psz, pszMatch, sizeof(pszMatch)-1) == 0)
+#define StringCase(psz, pszMatch) (strnicmp(psz, pszMatch, sizeof(pszMatch)-1) == 0 \
+                                   && (   psz[sizeof(pszMatch)-1] == '\0' \
+                                       || psz[sizeof(pszMatch)-1] == ' '  \
+                                       || psz[sizeof(pszMatch)-1] == '\n' \
+                                       || psz[sizeof(pszMatch)-1] == '\r' \
+                                       || psz[sizeof(pszMatch)-1] == '\t' \
+                                       ) \
+                                   )
 
 /*******************************************************************************

trunk/tools/common/makefile

@@ -1 @@
-# $Id: makefile,v 1.10 2000-12-02 23:26:58 bird Exp $
+# $Id: makefile,v 1.11 2000-12-16 20:10:07 bird Exp $
 
 #
@@ -40 +40 @@
 #
 needed:     $(OBJDIR)\common.lib \
-            $(ODIN32_TOOLS)\kDef2Wat.exe
-
+            $(ODIN32_TOOLS)\kDef2Wat.exe \
+            $(SYMBOLIC)
 
 #
@@ -70 +70 @@
 # Clean rule.
 #
-clean:
+clean:  $(SYMBOLIC)
     $(MAKE_CMD) -f common.mak clean
     $(MAKE_CMD) -f kDef2Wat.mak clean
@@ -79 +79 @@
 # Dep rule - makes depenencies for C, C++ and Asm files.
 #
-dep:
+dep:    $(SYMBOLIC)
     $(DEPEND) $(CINCLUDES) *.c *.cpp *.h *.asm *.inc \
         *.rc *.dlg $(ODIN32_INCLUDE)\*.h -robj *.orc \
@@ -89 +89 @@
 # A simple hack to make nmake process the target.
 #
-force:
+force:  $(SYMBOLIC)
      -@echo ...
 
@@ -96 +96 @@
 # Lib rule - dummy rule
 #
-lib:
+lib:    $(SYMBOLIC)
 

trunk/tools/database/Makefile

@@ -1 @@
-# $Id: Makefile,v 1.15 2000-12-02 23:26:58 bird Exp $
+# $Id: Makefile,v 1.16 2000-12-16 20:10:07 bird Exp $
 
 #
@@ -114 +114 @@
 #
 clean:
-   $(RM) *.obj *.lib *.o *.a *.dll *.exe *.pch *.log *.map *.html
+    $(RM) *.obj *.lib *.o *.a *.dll *.exe *.pch *.log *.map *.html
+!ifdef ODIN32_BIN
+    $(RM) $(ODIN32_BIN)\StateUpd.exe $(ODIN32_BIN)\APIImport.exe $(ODIN32_BIN)\kHTMLPC.exe
+!endif
     $(DODIRS) "gd" $(MAKE_CMD) clean