diff --git a/GNUmakefile.libui b/GNUmakefile.libui index 847ce3d6..496c48a0 100644 --- a/GNUmakefile.libui +++ b/GNUmakefile.libui @@ -10,14 +10,18 @@ HFILES += \ NAME = libui -CFLAGS += \ - -fPIC +# GROAN GCC +#CFLAGS += \ +# -fPIC SUFFIX = $(LIBSUFFIX) LDFLAGS += \ - -shared \ - -fPIC \ + -shared +# weird things: +# GROAN GCC +# -fPIC \ +# confused by this # -Wl,-soname,$(NAME)$(SUFFIX).0 include GNUbaserules.mk diff --git a/windows/GNUosspecific.mk b/windows/GNUosspecific.mk index 50512181..313061d3 100644 --- a/windows/GNUosspecific.mk +++ b/windows/GNUosspecific.mk @@ -3,20 +3,13 @@ EXESUFFIX = .exe LIBSUFFIX = .dll +# TODO only when cross-compiling? ifeq ($(ARCH),amd64) - ifndef CC - CC = x86_64-w64-mingw32-gcc - endif - ifndef RC - RC = x86_64-w64-mingw32-windres - endif + CC = x86_64-w64-mingw32-gcc + RC = x86_64-w64-mingw32-windres else ifeq ($(ARCH),386) - ifndef CC - CC = i686-w64-mingw32-gcc - endif - ifndef RC - RC = i686-w64-mingw32-windres - endif + CC = i686-w64-mingw32-gcc + RC = i686-w64-mingw32-windres else ifneq ($(ARCH),default) $(error [FAIL] unknown architecture $(ARCH)) endif