[cadcdev-svn-commits] [SCM] branch master updated. 7b095e34ecffb5ac2732fa76410cdbad39e83bf5

[Christian G. <sa...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "An ethernet program loader for the Dreamcast.".

The branch, master has been updated
       via  7b095e34ecffb5ac2732fa76410cdbad39e83bf5 (commit)
       via  e4c018c095e3ad92b1f94e58dae9903f1677db74 (commit)
       via  770753bb2265ab242ecfaaeb27f019c9d1aa6024 (commit)
       via  9c3a8df083a9b301c48640c6e8befd7ca6a82ef2 (commit)
      from  c32cdb3fbf9d099b52d8e98f46e781b61f21df78 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7b095e34ecffb5ac2732fa76410cdbad39e83bf5
Author: Christian Groessler <ch...@gr...>
Date:   Thu Mar 28 01:42:14 2013 +0100

    set MAKE variable only if it isn't set already

commit e4c018c095e3ad92b1f94e58dae9903f1677db74
Author: Christian Groessler <ch...@gr...>
Date:   Thu Mar 28 01:41:11 2013 +0100

    make libelf installation directory configurable

commit 770753bb2265ab242ecfaaeb27f019c9d1aa6024
Author: Christian Groessler <ch...@gr...>
Date:   Thu Mar 28 01:31:13 2013 +0100

    add support for some BSDs

commit 9c3a8df083a9b301c48640c6e8befd7ca6a82ef2
Author: Christian Groessler <ch...@gr...>
Date:   Thu Mar 28 01:24:07 2013 +0100

    fix setting of TARGETCCVER if gcc version only has 2 parts

-----------------------------------------------------------------------

Summary of changes:
 Makefile                 |    2 +-
 Makefile.cfg             |   13 +++++++++----
 host-src/Makefile        |    2 +-
 host-src/tool/Makefile   |    5 +++--
 host-src/tool/syscalls.c |    2 +-
 target-src/Makefile      |    2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 9466fd7..aa7edd6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include Makefile.cfg
 
 SUBDIRS = host-src target-src example-src
-MAKE	= make
+MAKE	?= make
 
 all: subdirs
 
diff --git a/Makefile.cfg b/Makefile.cfg
index 6a37ea0..3fe3b64 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -10,17 +10,22 @@ HOSTLDFLAGS	=
 
 # these must point to your sh-elf bfd, not the system one
 BFDLIB		= -L/opt/dc/sh-elf/lib -lbfd -liberty -lintl
-BFDINCLUDE	= /opt/dc/sh-elf/include
+BFDINCLUDE	= -I/opt/dc/sh-elf/include
 
 # cygwin
 # these must point to your sh-elf bfd, not the system one
 #BFDLIB		= -L/usr/local/lib -lbfd -liberty -lintl
-#BFDINCLUDE	= /usr/local/include
+#BFDINCLUDE	= -I/usr/local/include
 
 # MinGW
 # these must point to your sh-elf bfd, not the system one
 #BFDLIB		= -L/usr/local/lib -lbfd -liberty -lws2_32 -lwsock32
-#BFDINCLUDE	= /usr/local/include
+#BFDINCLUDE	= -I/usr/local/include
+
+# When using libelf instead of BFD, these must point to your
+# libelf installation (leave empty if libelf is part of the system)
+#ELFLIB		= -L/opt/misc.ppc/lib
+#ELFINCLUDE	= -I/opt/misc.ppc/include
 
 # sh-elf-stuff
 # if you have the SH compiler in your path you can leave SHTOOLS empty,
@@ -34,7 +39,7 @@ TARGETOBJCOPY	= $(SHTOOLS)sh-elf-objcopy
 TARGETLD	= $(SHTOOLS)sh-elf-ld
 # set TARGETCCVER to 3 or 4, depending on your SH compiler version (gcc 3.x or gcc 4.x)
 # this line tries to detect the version automatically
-TARGETCCVER	= $(shell $(TARGETCC) --version | head -1 | sed  "s/.* \([[:digit:]][[:digit:]]*\)\.[[:digit:]][[:digit:]]*\.[[:digit:]][[:digit:]]*.*/\1/")
+TARGETCCVER	= $(shell $(TARGETCC) --version | head -1 | sed  "s/.* \([[:digit:]][[:digit:]]*\)\.[[:digit:]][[:digit:]]*.*/\1/")
 
 # you generally shouldn't change this unless you are making forked
 # versions (or test versions)
diff --git a/host-src/Makefile b/host-src/Makefile
index 0bf2e1e..fe9505c 100644
--- a/host-src/Makefile
+++ b/host-src/Makefile
@@ -1,5 +1,5 @@
 SUBDIRS = tool
-MAKE	= make
+MAKE	?= make
 
 .PHONY : subdirs $(SUBDIRS)
 
diff --git a/host-src/tool/Makefile b/host-src/tool/Makefile
index 6b7a3ad..eb2b128 100644
--- a/host-src/tool/Makefile
+++ b/host-src/tool/Makefile
@@ -2,13 +2,14 @@ include ../../Makefile.cfg
 
 CC	= $(HOSTCC)
 CFLAGS	= $(HOSTCFLAGS) -DDREAMCAST_IP=\"$(DREAMCAST_IP)\" -DHAVE_GETOPT
-INCLUDE	= -I$(BFDINCLUDE)
 
 ifdef WITH_BFD
 	CFLAGS	+= -DWITH_BFD
 	LDFLAGS	= $(HOSTLDFLAGS) $(BFDLIB)
+	INCLUDE	= $(BFDINCLUDE)
 else
-	LDFLAGS	= $(HOSTLDFLAGS) -lelf
+	LDFLAGS	= $(HOSTLDFLAGS) $(ELFLIB) -lelf
+	INCLUDE	= $(ELFINCLUDE)
 endif
 
 DCTOOL	= dc-tool$(EXECUTABLEEXTENSION)
diff --git a/host-src/tool/syscalls.c b/host-src/tool/syscalls.c
index d80f47a..ab451fc 100644
--- a/host-src/tool/syscalls.c
+++ b/host-src/tool/syscalls.c
@@ -391,7 +391,7 @@ int dc_readdir(unsigned char * buffer)
         somedirent = NULL;
 
     if (somedirent) {
-#ifdef __APPLE__
+#if defined (__APPLE__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__)
 	dcdirent.d_ino = dc_order(somedirent->d_fileno);
 	dcdirent.d_off = dc_order(0);
 	dcdirent.d_reclen = dc_order(somedirent->d_reclen);
diff --git a/target-src/Makefile b/target-src/Makefile
index 2d18d22..5d2e8a2 100644
--- a/target-src/Makefile
+++ b/target-src/Makefile
@@ -1,5 +1,5 @@
 SUBDIRS = 1st_read dcload
-MAKE	= make
+MAKE	?= make
 
 .PHONY : subdirs $(SUBDIRS)
 


hooks/post-receive
-- 
An ethernet program loader for the Dreamcast.