Borland C++ build doesn't depend on Cygwin configure

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2242 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 2dd05ace9629760b6589bc01876b9cb5dc7acb82..5a0f28f697d5b62de45b45d621a5811b89b3f748 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-02-10  Borut Razem <borut.razem@siol.net>
+
+       * doc/bccinst.txt, packihx/packihx.c, sdcc_vc_in.h, src/SDCCset.h,
+       support/cpp2/config.in: Borland C++ build doesn't depend on Cygwin configure
+       * Bcc.ini, Makefile.bcc, as/mcs51/Makefile.bcc,
+       device/examples/ds390/tinitalk/Makefile.bcc, packihx/Makefile.bcc,
+       support/cpp2/Makefile.bcc, src/Makefile.bcc, src/avr/Makefile.bcc,
+       src/ds390/Makefile.bcc, src/izt/Makefile.bcc, src/mcs51/Makefile.bcc,
+       src/pic/Makefile.bcc, src/pic16/Makefile.bcc, src/xa15/Makefile.bcc,
+       src/z80/Makefile.bcc: Borland Makefile cleanup
+       * as/z80/Makefile.bcc: Added Borland Makefile
+
 2003-02-10  Bernhard Held <bernhard@bernhardheld.de>
 
        * doc/sdccman.lyx: new pragma NOIV by "Johannes Stezenbach" <js@convergence.de>

diff --git a/doc/bccinst.txt b/doc/bccinst.txt
index e05406d5849d64996e7add310349b3c683affd60..a808722a084781d081d7999cdcb63606223e6ea1 100644 (file)
--- a/doc/bccinst.txt
+++ b/doc/bccinst.txt
@@ -1,17 +1,18 @@
 Building SDCC with Borland C++ under Windows
 
-1: Build SDCC under Cygwin as documented in cygwininst.txt (this is
-necessary in order to run all the necessary configuration steps).
-
-2: From the sdcc directory, run the command "make -f Makefile.bcc". This
+1: From the sdcc directory, run the command "make -f Makefile.bcc". This
 should regenerate all the .exe files in the bin directory except for
 sdcdb.exe (which currently doesn't build under Borland C++).
 
-3: If you modify any source files and need to rebuild, be aware that the
+2: If you modify any source files and need to rebuild, be aware that the
 dependancies may not be correctly calculated. The safest option is to
 delete all .obj files and run the build again. From a Cygwin BASH
 prompt, this can easily be done with the commmand:
 
- 'find . -name "*.obj" -print | xargs rm'
+$ find . \( -name '*.obj' -o -name '*.lib' -o -name '*.rul' \) -print -exec rm {} \;
+
+or on Windows NT/2000/XP from the command prompt with the commmand:
+
+del /s *.obj *.lib *.rul
 
 from the sdcc directory.

diff --git a/packihx/packihx.c b/packihx/packihx.c
index 6dbb180b7833dc4a5b0bbffd41857aacf69e1693..a9cf4e7a48785ed808036485f68faf3dc81f66a2 100644 (file)
--- a/packihx/packihx.c
+++ b/packihx/packihx.c
@@ -14,7 +14,7 @@
 #include <ctype.h>
 #include <assert.h>
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__BORLANDC__)
 
 typedef unsigned char Uint8 ;
 typedef unsigned Uint16 ;

diff --git a/sdcc_vc_in.h b/sdcc_vc_in.h
index bcd19cd6d1cb88468010c4c37d4ec2757cff4098..8115eb91327293bde72ce0b5184da25883e8018a 100644 (file)
--- a/sdcc_vc_in.h
+++ b/sdcc_vc_in.h
@@ -7,10 +7,8 @@
 #undef SDCC_VERSION_P
 #undef SDCC_VERSION_STR
 
-/* MSVC 6 does not have __FUNCTION__ preprocessor macro defined */
-
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-#define __FUNCTION__ __FILE__
+#ifndef __FUNCTION__
+#define __FUNCTION__  __FILE__
 #endif
 
 #undef PREFIX

diff --git a/src/SDCCset.h b/src/SDCCset.h
index ea503e5738fc795e50df908d012cf233402a9f97..c3bd289c079de8c46da51dccbfc238f8c4acd23b 100644 (file)
--- a/src/SDCCset.h
+++ b/src/SDCCset.h
@@ -26,7 +26,7 @@
 #define SDCCSET_H
 #include <stdarg.h>
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__BORLANDC__)
 #include "sdcc_vc.h"
 #else
 #include "sdccconf.h"

diff --git a/support/cpp2/config.in b/support/cpp2/config.in
index 25540a866ebec5343b07e4f88989dd4a7a3e85c7..1a3552c7b58dde8e6553e4bf10d5c0079328071e 100644 (file)
--- a/support/cpp2/config.in
+++ b/support/cpp2/config.in
@@ -1,10 +1,5 @@
 /* config.in.  Generated automatically from configure.in by autoheader.  */
 
-#ifdef __BORLANDC__
-
-#include "borland.h"
-
-#else
 /* Define to empty if the keyword does not work.  */
 #undef const
 
@@ -389,4 +384,3 @@
 #define const
 #endif
 #endif
-#endif /* !__BORLANDC__ */