Fixed errors in Makefiles for Linux and MingW (plus extra #include in…

… elf.c).
compuphase · Apr 20, 2022 · 402584d · 402584d
1 parent e95ae6d
commit 402584d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/source/Makefile.linux b/source/Makefile.linux
@@ -211,7 +211,7 @@ bmscan : $(OBJLIST_BMSCAN)
 	$(LNK) $(LFLAGS) -o$@ $^ -lbsd -lpthread
 
 elf-postlink : $(OBJLIST_POSTLINK)
-	$(LNK) $(LFLAGS) -o$@ $^
+	$(LNK) $(LFLAGS) -o$@ $^ -lbsd
 
 tracegen : $(OBJLIST_TRACEGEN)
 	$(LNK) $(LFLAGS) -o$@ $^ -lbsd

diff --git a/source/Makefile.mingw b/source/Makefile.mingw
@@ -92,7 +92,7 @@ OBJLIST_BMTRACE = bmtrace.o bmcommon.o bmp-scan.o bmp-script.o bmp-support.o \
 
 OBJLIST_BMSCAN = bmscan.o bmp-scan.o tcpip.o
 
-OBJLIST_POSTLINK = elf-postlink.o elf.o
+OBJLIST_POSTLINK = elf-postlink.o elf.o strlcpy.o
 
 OBJLIST_TRACEGEN = tracegen.o parsetsdl.o strlcpy.o
 

diff --git a/source/Makefile.msvc b/source/Makefile.msvc
@@ -88,7 +88,7 @@ OBJLIST_BMTRACE = bmtrace.obj bmcommon.obj bmp-scan.obj bmp-script.obj bmp-suppo
 
 OBJLIST_BMSCAN = bmscan.obj bmp-scan.obj tcpip.obj
 
-OBJLIST_POSTLINK = elf-postlink.obj elf.obj
+OBJLIST_POSTLINK = elf-postlink.obj elf.obj strlcpy.obj
 
 OBJLIST_TRACEGEN = tracegen.obj parsetsdl.obj strlcpy.obj
 

diff --git a/source/elf.c b/source/elf.c
@@ -25,6 +25,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include "elf.h"
+#if defined WIN32 || defined _WIN32
+  #if defined __MINGW32__ || defined __MINGW64__ || defined _MSC_VER
+    #include "strlcpy.h"
+  #endif
+#elif defined __linux__
+  #include <bsd/string.h>
+#endif
 
 #if defined __GNUC__
   #define PACKED        __attribute__((packed))