Skip to content

Commit 402584d

Browse files
committed
Fixed errors in Makefiles for Linux and MingW (plus extra #include in elf.c).
1 parent e95ae6d commit 402584d

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

‎source/Makefile.linux‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ bmscan : $(OBJLIST_BMSCAN)
211211
$(LNK) $(LFLAGS) -o$@ $^ -lbsd -lpthread
212212

213213
elf-postlink : $(OBJLIST_POSTLINK)
214-
$(LNK) $(LFLAGS) -o$@ $^
214+
$(LNK) $(LFLAGS) -o$@ $^ -lbsd
215215

216216
tracegen : $(OBJLIST_TRACEGEN)
217217
$(LNK) $(LFLAGS) -o$@ $^ -lbsd

‎source/Makefile.mingw‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ OBJLIST_BMTRACE = bmtrace.o bmcommon.o bmp-scan.o bmp-script.o bmp-support.o \
9292

9393
OBJLIST_BMSCAN = bmscan.o bmp-scan.o tcpip.o
9494

95-
OBJLIST_POSTLINK = elf-postlink.o elf.o
95+
OBJLIST_POSTLINK = elf-postlink.o elf.o strlcpy.o
9696

9797
OBJLIST_TRACEGEN = tracegen.o parsetsdl.o strlcpy.o
9898

‎source/Makefile.msvc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ OBJLIST_BMTRACE = bmtrace.obj bmcommon.obj bmp-scan.obj bmp-script.obj bmp-suppo
8888

8989
OBJLIST_BMSCAN = bmscan.obj bmp-scan.obj tcpip.obj
9090

91-
OBJLIST_POSTLINK = elf-postlink.obj elf.obj
91+
OBJLIST_POSTLINK = elf-postlink.obj elf.obj strlcpy.obj
9292

9393
OBJLIST_TRACEGEN = tracegen.obj parsetsdl.obj strlcpy.obj
9494

‎source/elf.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@
2525
#include <stdlib.h>
2626
#include <string.h>
2727
#include "elf.h"
28+
#if defined WIN32 || defined _WIN32
29+
#if defined __MINGW32__ || defined __MINGW64__ || defined _MSC_VER
30+
#include "strlcpy.h"
31+
#endif
32+
#elif defined __linux__
33+
#include <bsd/string.h>
34+
#endif
2835

2936
#if defined __GNUC__
3037
#define PACKED __attribute__((packed))

0 commit comments

Comments
 (0)