blob: 3c74e19dcdbb45af2f52cf128e378aac0a2df150 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- makefile.orig 2010-03-13 20:41:15.000000000 -0500
+++ makefile 2010-04-05 07:57:38.000000000 -0400
@@ -5,7 +5,7 @@
# GNU make does not like \r\n line endings so should be saved to CVS in binary form.
.SUFFIXES: .cxx .o .h .a .c
-CC = g++
+#CC = g++
AR = ar
# If explicit setting of GTK1 or GTK2 then use that else look for
@@ -26,7 +26,7 @@
CONFIGFLAGS:=$(shell pkg-config --cflags gtk+-2.0)
CONFIGLIB:=$(shell pkg-config --libs gtk+-2.0 gthread-2.0)
CONFIGTHREADS:=
-gnomeprefix:=$(shell pkg-config --variable=prefix gtk+-2.0 2>/dev/null)
+gnomeprefix:=$(PREFIX)
else
CONFIGFLAGS:=$(shell gtk-config --cflags)
CONFIGLIB:=$(shell gtk-config --libs)
@@ -76,12 +76,12 @@
INCLUDEDIRS=-I ../../scintilla/include -I ../src -I../lua/include
$(LUA_CORE_OBJS): ../lua/src/*.c
- gcc $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
+ gcc $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/*.c
$(LUA_LIB_OBJS): ../lua/src/lib/*.c
- gcc $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
-CXXFLAGS=$(CXXTFLAGS)
+ gcc $(CFLAGS) $(INCLUDEDIRS) -DLUA_USE_POSIX $(CXXTFLAGS) -c ../lua/src/lib/*.c
+CXXFLAGS+=$(CXXTFLAGS)
else
-CXXFLAGS=$(CXXTFLAGS) -DNO_LUA
+CXXFLAGS+=$(CXXTFLAGS) -DNO_LUA
endif
ifeq ($(shell uname), Darwin)
@@ -102,8 +102,9 @@
$(PROG): SciTEGTK.o GUIGTK.o FilePath.o SciTEBase.o SciTEBuffers.o SciTEIO.o StringList.o Exporters.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,--version-script lua.vers -DGTK $^ -o $@ $(CONFIGLIB)
+ JobQueue.o GTKMutex.o IFaceTable.o $(LUA_OBJS)
+ $(CC) $(CONFIGLIB) -lscintilla -lscintilla_lexers \
+ -rdynamic -Wl,--version-script lua.vers -DGTK $^ -o $@
# Automatically generate header dependencies with "make deps"
include deps.mak
|
