Skip to content

Commit af97d3c

Browse files
committed
Re-added linking with libdl for other targets, other than Windows.
1 parent 298c2e7 commit af97d3c

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,21 @@ CC = /usr/bin/gcc
2121
CPPFLAGS += -I/opt/local/include -L/opt/local/lib
2222
DIST_PACK_CMD = tar cvfz
2323
DIST_PACK_EXT = .tar.gz
24+
LDFLAGS = -ldl
2425
else ifeq ($(OS),Windows_NT)
2526
SHARED = -shared
2627
SHAREDSUFFIX = .dll
2728
EXECSUFFIX = .exe
2829
DIST_PACK_CMD = zip -9
2930
DIST_PACK_EXT = .zip
31+
LDFLAGS = #Libdl is built into glibc for both Cygwin and MinGW.
3032
else
3133
SHARED = -shared
3234
SHAREDSUFFIX = .so
3335
EXECSUFFIX =
3436
DIST_PACK_CMD = tar cvfz
3537
DIST_PACK_EXT = .tar.gz
38+
LDFLAGS = -ldl
3639
endif
3740

3841
PACKERS = zlib-packer lzo-packer n2b-packer n2d-packer n2e-packer null-packer
@@ -49,10 +52,10 @@ install: all
4952
PREFIX=$(PREFIX) $(SUBMAKE) stub install
5053

5154
ps2-packer: ps2-packer.c dlopen.c
52-
$(CC) $(CPPFLAGS) ps2-packer.c dlopen.c -o ps2-packer$(EXECSUFFIX)
55+
$(CC) $(CPPFLAGS) ps2-packer.c dlopen.c $(LDFLAGS) -o ps2-packer$(EXECSUFFIX)
5356

5457
ps2-packer-lite: ps2-packer.c builtin_stub_one.o builtin_stub.o
55-
$(CC) $(CPPFLAGS) -DPS2_PACKER_LITE ps2-packer.c n2e-packer.c $(LIBUCLA) builtin_stub_one.o builtin_stub.o -o ps2-packer-lite$(EXECSUFFIX)
58+
$(CC) $(CPPFLAGS) -DPS2_PACKER_LITE ps2-packer.c n2e-packer.c $(LIBUCLA) builtin_stub_one.o builtin_stub.o $(LDFLAGS) -o ps2-packer-lite$(EXECSUFFIX)
5659

5760
builtin_stub_one.c: stubs-tag.stamp
5861
cp stub/n2e-asm-one-1d00-stub ./b_stub_one

0 commit comments

Comments
 (0)