parent
fcd86ff2df
commit
f2becd7c39
@ -0,0 +1,41 @@
|
||||
--- GtkD-3.3.1/GNUmakefile.orig 2016-11-30 12:09:00.314067964 +0100
|
||||
+++ GtkD-3.3.1/GNUmakefile 2016-11-30 12:13:10.087744201 +0100
|
||||
@@ -4,7 +4,6 @@
|
||||
datadir=$(prefix)/share
|
||||
|
||||
OS=$(shell uname || uname -s)
|
||||
-ARCH=$(shell uname -m || arch)
|
||||
|
||||
ifndef DC
|
||||
ifneq ($(strip $(shell which dmd 2>/dev/null)),)
|
||||
@@ -49,22 +48,6 @@
|
||||
LDFLAGS+=$(LINKERFLAG)-ldl
|
||||
endif
|
||||
|
||||
-ifndef MODEL
|
||||
- ifeq ("$(ARCH)", "x86_64")
|
||||
- MODEL=64
|
||||
- else
|
||||
- MODEL=32
|
||||
- endif
|
||||
-endif
|
||||
-
|
||||
-ifeq ($(MODEL), 64)
|
||||
- DCFLAGS+=-m64
|
||||
- LDFLAGS+=-m64
|
||||
-else
|
||||
- DCFLAGS+=-m32
|
||||
- LDFLAGS+=-m32
|
||||
-endif
|
||||
-
|
||||
AR=ar
|
||||
RANLIB=ranlib
|
||||
|
||||
@@ -197,7 +180,6 @@
|
||||
# Create a versioned symlink so the demo is able to load it.
|
||||
|
||||
$(BINNAME_DEMO): IMPORTS=-Isrc -Idemos/gtkD/TestWindow
|
||||
-$(BINNAME_DEMO): DCFLAGS=-m$(MODEL)
|
||||
$(BINNAME_DEMO): $(OBJECTS_DEMO)
|
||||
$(if $(wildcard $(SONAME_GTKD)),,$(if $(wildcard $(LIBNAME_GTKD)),,$(MAKE) $(LIBNAME_GTKD)))
|
||||
$(if $(wildcard $(SONAME_GTKD)),$(eval LDFLAGS+= $(LINKERFLAG)-rpath=./))
|
Loading…
Reference in new issue