mirror of
https://git.freebsd.org/ports.git
synced 2025-06-03 03:46:30 -04:00
61 lines
2 KiB
Text
61 lines
2 KiB
Text
--- makefile.orig 2011-06-13 20:55:05.000000000 -0400
|
|
+++ makefile 2011-07-03 21:16:59.000000000 -0400
|
|
@@ -5,13 +5,13 @@
|
|
# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
|
|
|
|
.SUFFIXES: .cxx .o .h .a .c
|
|
-ifdef CLANG
|
|
-CC = clang
|
|
-CCOMP = clang
|
|
-else
|
|
-CC = g++
|
|
-CCOMP = gcc
|
|
-endif
|
|
+#ifdef CLANG
|
|
+#CC = clang
|
|
+#CCOMP = clang
|
|
+#else
|
|
+#CC = g++
|
|
+#CCOMP = gcc
|
|
+#endif
|
|
AR = ar
|
|
|
|
ifdef GTK3
|
|
@@ -24,7 +24,7 @@
|
|
CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION))
|
|
CONFIGLIB:=$(shell pkg-config --libs $(GTKVERSION) gthread-2.0)
|
|
CONFIGTHREADS:=
|
|
-gnomeprefix:=$(shell pkg-config --variable=prefix $(GTKVERSION) 2>/dev/null)
|
|
+gnomeprefix:=$(PREFIX)
|
|
ifndef prefix
|
|
ifdef gnomeprefix
|
|
prefix=$(gnomeprefix)
|
|
@@ -70,12 +70,12 @@
|
|
|
|
INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
|
|
$(LUA_CORE_OBJS): ../lua/src/*.c
|
|
- $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
|
|
+ $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
|
|
$(LUA_LIB_OBJS): ../lua/src/lib/*.c
|
|
- $(CCOMP) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
|
|
-CXXFLAGS=$(CXXTFLAGS)
|
|
+ $(CCOMP) $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
|
|
+CXXFLAGS+=$(CXXTFLAGS)
|
|
else
|
|
-CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
|
|
+CXXFLAGS+=$(CXXTFLAGS) -DNO_LUA
|
|
endif
|
|
|
|
CXXFLAGS:=$(CXXFLAGS) -Wno-long-long
|
|
@@ -99,8 +99,9 @@
|
|
$(PROG): SciTEGTK.o GUIGTK.o Widget.o \
|
|
FilePath.o SciTEBase.o Credits.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.o StringHelpers.o \
|
|
PropSetFile.o MultiplexExtension.o DirectorExtension.o SciTEProps.o StyleWriter.o Utf8_16.o \
|
|
- JobQueue.o GTKMutex.o IFaceTable.o $(COMPLIB) $(LUA_OBJS)
|
|
- $(CC) `$(CONFIGTHREADS)` -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB) -ldl -lstdc++
|
|
+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
|
|
+ $(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers -lstdc++ \
|
|
+ -rdynamic -Wl,--as-needed -Wl,--version-script lua.vers -DGTK $^ -o $@
|
|
|
|
# Automatically generate header dependencies with "make deps"
|
|
include deps.mak
|