Blame wings-0001-Respect-CFLAGS.patch
|
 |
bf95278 |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
bf95278 |
Date: Thu, 21 Mar 2013 18:53:10 +0400
|
|
|
8b193d9 |
Subject: [PATCH] Respect CFLAGS
|
|
|
bf95278 |
|
|
|
bf95278 |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
bf95278 |
|
|
|
4906fb3 |
diff --git a/c_src/Makefile b/c_src/Makefile
|
|
|
4906fb3 |
index b79c696f..d91ceed3 100644
|
|
|
4906fb3 |
--- a/c_src/Makefile
|
|
|
4906fb3 |
+++ b/c_src/Makefile
|
|
|
4906fb3 |
@@ -44,9 +44,6 @@ FRD = 'io:fwrite("~n=:~s~n",[code:root_dir()]),init:stop().'
|
|
|
4906fb3 |
ERL_DIR := $(shell echo $(FRD) | $(ERL) | sed -n '/^=:/s/^=://p')
|
|
|
6b1b643 |
ERL_INC = "$(ERL_DIR)/usr/include"
|
|
|
bf95278 |
|
|
|
f195ead |
-UNIVERSAL_FLAGS =
|
|
|
de6456f |
-COMMON_CFLAGS = -Wall
|
|
|
f195ead |
-
|
|
|
de6456f |
ifeq ($(UseMCL),true)
|
|
|
de6456f |
OUT = -Fe:
|
|
|
bf95278 |
SO_EXT = dll
|
|
|
4906fb3 |
@@ -68,8 +65,7 @@ else
|
|
|
de6456f |
GL_LIBS =
|
|
|
de6456f |
else
|
|
|
de6456f |
LIBS = -shared -fpic
|
|
|
79accde |
- GL_LIBS += -L/usr/local/lib -lGLU -lGL
|
|
|
79accde |
- CFLAGS += $(COMMON_CFLAGS) -Werror -O3
|
|
|
79accde |
+ GL_LIBS += -lGLU -lGL
|
|
|
de6456f |
endif
|
|
|
bf95278 |
endif
|
|
|
bf95278 |
endif
|
|
|
4906fb3 |
@@ -86,7 +82,7 @@ all: $(TARGET_FILES)
|
|
|
bf95278 |
|
|
|
bf95278 |
$(LIBDIR)/%.$(SO_EXT): %.c
|
|
|
bf95278 |
install -d $(LIBDIR)
|
|
|
de6456f |
- $(GCC) $(CFLAGS) -I$(ERL_INC) $(OUT) $@ $< $(LIBS) $(GL_LIBS)
|
|
|
bf95278 |
+ $(GCC) $(CFLAGS) -fPIC -I$(ERL_INC) -o $@ $< $(LIBS) $(GL_LIBS)
|
|
|
bf95278 |
|
|
|
bf95278 |
clean:
|
|
|
4906fb3 |
rm -f $(TARGET_FILES) vc*.pdb wings_pick_*.obj
|