ChangeLogTag:Wed Jul 24 08:13:48 2002 Christopher Kohlhoff <chris@kohlhoff.com>

6 files changed, 77 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index cc03fd64be7..020389202f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Jul 24 08:13:48 2002  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * include/makeinclude/build_dll.bor:
+        * include/makeinclude/build_exe.bor:
+        * include/makeinclude/build_lib.bor:
+        * include/makeinclude/make_flags.bor:
+          Improve debugging support with Borland C++Builder by invoking the
+          compiler with a full path to each source file. This can be disabled
+          by setting a NO_FULL_PATH environment variable to 1 or by passing
+          -DNO_FULL_PATH when running make, which may be necessary when doing
+          a debug build on Win9x.
+
 Wed Jul 24 07:45:43 2002  Chad Elliott  <elliott_c@ociweb.com>
 
         * THANKS: Added Tim Bradley to the hall of fame.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index cc03fd64be7..020389202f0 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,15 @@
+Wed Jul 24 08:13:48 2002  Christopher Kohlhoff  <chris@kohlhoff.com>
+
+        * include/makeinclude/build_dll.bor:
+        * include/makeinclude/build_exe.bor:
+        * include/makeinclude/build_lib.bor:
+        * include/makeinclude/make_flags.bor:
+          Improve debugging support with Borland C++Builder by invoking the
+          compiler with a full path to each source file. This can be disabled
+          by setting a NO_FULL_PATH environment variable to 1 or by passing
+          -DNO_FULL_PATH when running make, which may be necessary when doing
+          a debug build on Win9x.
+
 Wed Jul 24 07:45:43 2002  Chad Elliott  <elliott_c@ociweb.com>
 
         * THANKS: Added Tim Bradley to the hall of fame.
diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor
index e44e309b4fb..561b4e0ba92 100644
--- a/include/makeinclude/build_dll.bor
+++ b/include/makeinclude/build_dll.bor
@@ -67,13 +67,29 @@ INSTALL_TYPES =	dll lib	includes
 
 .path.obj = $(OBJDIR)
 
+!ifdef DEBUG
+!ifndef NO_FULL_PATH
+USE_FULL_PATH = 1
+!endif
+!endif
+
 .cpp.obj:
 	@$(MAKE_OBJDIR)
+!ifdef USE_FULL_PATH
+	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+	@for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+!else
 	$(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) $<
+!endif
 
 .c.obj:
 	@$(MAKE_OBJDIR)
+!ifdef USE_FULL_PATH
+	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+	@for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+!else
 	$(CC) $(COMMON_CFLAGS) $(DLL_CFLAGS) $(CFLAGS) -c -n$(@D) $<
+!endif
 
 .rc.res:
 	@$(MAKE_OBJDIR)
diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor
index b90489cebcf..d26dd3abcee 100644
--- a/include/makeinclude/build_exe.bor
+++ b/include/makeinclude/build_exe.bor
@@ -79,13 +79,29 @@ INSTALL_TYPES =	exe
 
 .path.obj = $(OBJDIR)
 
+!ifdef DEBUG
+!ifndef NO_FULL_PATH
+USE_FULL_PATH = 1
+!endif
+!endif
+
 .cpp.obj:
 	@$(MAKE_OBJDIR)
+!ifdef USE_FULL_PATH
+	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+	@for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+!else
 	$(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) $<
+!endif
 
 .c.obj:
 	@$(MAKE_OBJDIR)
+!ifdef USE_FULL_PATH
+	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+	@for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+!else
 	$(CC) $(COMMON_CFLAGS) $(EXE_CFLAGS) $(CFLAGS) -c -n$(@D) $<
+!endif
 
 .rc.res:
 	@$(MAKE_OBJDIR)
diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor
index 6b279396c09..9ffc6521f93 100644
--- a/include/makeinclude/build_lib.bor
+++ b/include/makeinclude/build_lib.bor
@@ -56,12 +56,28 @@ INSTALL_TYPES =	lib includes
 
 .path.obj = $(OBJDIR)
 
+!ifdef DEBUG
+!ifndef NO_FULL_PATH
+USE_FULL_PATH = 1
+!endif
+!endif
+
 .cpp.obj:
 	@$(MAKE_OBJDIR)
+!ifdef USE_FULL_PATH
+	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+	@for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+!else
 	$(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) $<
+!endif
 
 .c.obj:
 	@$(MAKE_OBJDIR)
+!ifdef USE_FULL_PATH
+	@for /F "delims=;" %i in ('cd') do @echo $(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+	@for /F "delims=;" %i in ('cd') do @$(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) %i\$<
+!else
 	$(CC) $(COMMON_CFLAGS) $(LIB_CFLAGS) $(CFLAGS) -c -n$(@D) $<
+!endif
 
 .autodepend
diff --git a/include/makeinclude/make_flags.bor b/include/makeinclude/make_flags.bor
index 78fe5678615..c71c5f8ed15 100644
--- a/include/makeinclude/make_flags.bor
+++ b/include/makeinclude/make_flags.bor
@@ -46,5 +46,9 @@ INSTALL_DIR_FLAG = -DINSTALL_DIR=$(INSTALL_DIR)
 UNICODE_FLAG = -DUNICODE
 !endif
 
+!ifdef NO_FULL_PATH
+NO_FULL_PATH_FLAG = -DNO_FULL_PATH
+!endif
+
 MAKE_FLAGS = $(DEBUG_FLAG) $(STATIC_FLAG) $(PASCAL_FLAG) $(UNICODE_FLAG) \
-       $(CODEGUARD_FLAG) $(INSTALL_DIR_FLAG)
+       $(CODEGUARD_FLAG) $(INSTALL_DIR_FLAG) $(NO_FULL_PATH_FLAG)