More makefile fixes.
This commit is contained in:
parent
f19d3cd0c7
commit
260a7f4879
|
@ -10,14 +10,18 @@ HFILES += \
|
||||||
|
|
||||||
NAME = libui
|
NAME = libui
|
||||||
|
|
||||||
CFLAGS += \
|
# GROAN GCC
|
||||||
-fPIC
|
#CFLAGS += \
|
||||||
|
# -fPIC
|
||||||
|
|
||||||
SUFFIX = $(LIBSUFFIX)
|
SUFFIX = $(LIBSUFFIX)
|
||||||
|
|
||||||
LDFLAGS += \
|
LDFLAGS += \
|
||||||
-shared \
|
-shared
|
||||||
-fPIC \
|
# weird things:
|
||||||
|
# GROAN GCC
|
||||||
|
# -fPIC \
|
||||||
|
# confused by this
|
||||||
# -Wl,-soname,$(NAME)$(SUFFIX).0
|
# -Wl,-soname,$(NAME)$(SUFFIX).0
|
||||||
|
|
||||||
include GNUbaserules.mk
|
include GNUbaserules.mk
|
||||||
|
|
|
@ -3,20 +3,13 @@
|
||||||
EXESUFFIX = .exe
|
EXESUFFIX = .exe
|
||||||
LIBSUFFIX = .dll
|
LIBSUFFIX = .dll
|
||||||
|
|
||||||
|
# TODO only when cross-compiling?
|
||||||
ifeq ($(ARCH),amd64)
|
ifeq ($(ARCH),amd64)
|
||||||
ifndef CC
|
|
||||||
CC = x86_64-w64-mingw32-gcc
|
CC = x86_64-w64-mingw32-gcc
|
||||||
endif
|
|
||||||
ifndef RC
|
|
||||||
RC = x86_64-w64-mingw32-windres
|
RC = x86_64-w64-mingw32-windres
|
||||||
endif
|
|
||||||
else ifeq ($(ARCH),386)
|
else ifeq ($(ARCH),386)
|
||||||
ifndef CC
|
|
||||||
CC = i686-w64-mingw32-gcc
|
CC = i686-w64-mingw32-gcc
|
||||||
endif
|
|
||||||
ifndef RC
|
|
||||||
RC = i686-w64-mingw32-windres
|
RC = i686-w64-mingw32-windres
|
||||||
endif
|
|
||||||
else ifneq ($(ARCH),default)
|
else ifneq ($(ARCH),default)
|
||||||
$(error [FAIL] unknown architecture $(ARCH))
|
$(error [FAIL] unknown architecture $(ARCH))
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue