aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2015-11-11 10:20:36 +1100
committerNeil <nyamatongwe@gmail.com>2015-11-11 10:20:36 +1100
commite3d6bf27e25313b13c2917dee7dbb2761144f616 (patch)
treee5ce82105e5fa12927fc01b4cc6f286246d373d3
parent9c106f2d34cb7e3f9d4f7638972af1e052fae5d9 (diff)
downloadscintilla-mirror-e3d6bf27e25313b13c2917dee7dbb2761144f616.tar.gz
Don't use -fPIC on Windows due to warnings.
-rw-r--r--gtk/makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk/makefile b/gtk/makefile
index 57a91226c..f9086fa34 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -31,6 +31,11 @@ RANLIB = ranlib
endif
endif
+# Enable Position Independent Code except on Windows where it is the default so the flag produces a warning
+ifndef windir
+PICFLAGS = -fPIC
+endif
+
ifdef windir
DEL = del /q
COMPLIB=..\bin\scintilla.a
@@ -46,7 +51,7 @@ INCLUDEDIRS=-I ../include -I ../src -I ../lexlib
ifdef CHECK_DEPRECATED
DEPRECATED=-DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DDISABLE_GDK_FONT
endif
-CXXBASEFLAGS=-Wall -pedantic -fPIC -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
+CXXBASEFLAGS=-Wall -pedantic $(PICFLAGS) -DGTK -DSCI_LEXER $(INCLUDEDIRS) $(DEPRECATED)
ifdef NOTHREADS
THREADFLAGS=-DG_THREADS_IMPL_NONE