|
 |
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 |
|
|
|
bf95278 |
diff --git a/plugins_src/accel/Makefile b/plugins_src/accel/Makefile
|
|
|
f195ead |
index 3439272..0848839 100644
|
|
|
bf95278 |
--- a/plugins_src/accel/Makefile
|
|
|
bf95278 |
+++ b/plugins_src/accel/Makefile
|
|
|
f195ead |
@@ -30,9 +30,6 @@ BEAM = $(LIBDIR)/wpc_pnoise.beam \
|
|
|
bf95278 |
$(LIBDIR)/pnoise.beam \
|
|
|
bf95278 |
$(LIBDIR)/wpc_pick.beam
|
|
|
bf95278 |
|
|
|
f195ead |
-UNIVERSAL_FLAGS =
|
|
|
f195ead |
-COMMON_CFLAGS = -Wall -Werror -O3
|
|
|
f195ead |
-
|
|
|
bf95278 |
ifdef USEMINGWGCC
|
|
|
bf95278 |
SO_EXT = dll
|
|
|
f195ead |
LIBS = -shared
|
|
|
f195ead |
@@ -47,8 +44,7 @@ else
|
|
|
bf95278 |
GL_LIBS =
|
|
|
bf95278 |
else
|
|
|
bf95278 |
LIBS = -shared -fpic
|
|
|
bf95278 |
- GL_LIBS = -L/usr/local/lib -lGLU -lGL
|
|
|
bf95278 |
- CFLAGS = $(COMMON_CFLAGS)
|
|
|
bf95278 |
+ GL_LIBS = -lGLU -lGL
|
|
|
bf95278 |
endif
|
|
|
bf95278 |
endif
|
|
|
bf95278 |
|
|
|
f195ead |
@@ -72,7 +68,7 @@ $(LIBDIR)/%.beam: %.erl
|
|
|
bf95278 |
|
|
|
bf95278 |
$(LIBDIR)/%.$(SO_EXT): %.c
|
|
|
bf95278 |
install -d $(LIBDIR)
|
|
|
bf95278 |
- $(GCC) $(COMMON_CFLAGS) -I$(ERL_INC) -o $@ $< $(LIBS) $(GL_LIBS)
|
|
|
bf95278 |
+ $(GCC) $(CFLAGS) -fPIC -I$(ERL_INC) -o $@ $< $(LIBS) $(GL_LIBS)
|
|
|
bf95278 |
|
|
|
bf95278 |
clean:
|
|
|
bf95278 |
rm -f $(TARGET_FILES)
|
|
|
bf95278 |
diff --git a/plugins_src/jpeg/Makefile b/plugins_src/jpeg/Makefile
|
|
|
f195ead |
index 6707f35..43eb52f 100644
|
|
|
bf95278 |
--- a/plugins_src/jpeg/Makefile
|
|
|
bf95278 |
+++ b/plugins_src/jpeg/Makefile
|
|
|
f195ead |
@@ -73,9 +73,7 @@ else
|
|
|
bf95278 |
|
|
|
bf95278 |
$(LIBDIR)/wings_jpeg_image_drv.so: wings_jpeg_image_drv.c
|
|
|
bf95278 |
install -d $(LIBDIR)
|
|
|
f195ead |
- $(GCC) -fPIC -o $(LIBDIR)/wings_jpeg_image_drv.so -I$(ERL_INC) \
|
|
|
bf95278 |
- -I/usr/local/include -L/usr/local/lib \
|
|
|
f195ead |
- wings_jpeg_image_drv.c $(LIBS) -ljpeg
|
|
|
f195ead |
+ $(GCC) $(CFLAGS) -fPIC -o $(LIBDIR)/wings_jpeg_image_drv.so -I$(ERL_INC) wings_jpeg_image_drv.c $(LIBS) -ljpeg
|
|
|
bf95278 |
|
|
|
bf95278 |
endif
|
|
|
f195ead |
|