← Back to branch summary

~ubuntu-branches/ubuntu/wily/geany/wily

« back to all changes in this revision

Viewing changes to src/makefile.win32

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2011-12-10 07:43:26 UTC
  • mfrom: (3.3.7 sid)
  • Revision ID: package-import@ubuntu.com-20111210074326-s8yqbew5i20h33tf
Tags: 0.21-1ubuntu1
* Merge from Debian Unstable, remaining changes:
  - debian/patches/20_use_evince_viewer.patch:
     + use evince as viewer for pdf and dvi files
  - debian/patches/20_use_x_terminal_emulator.patch:
     + use x-terminal-emulator as terminal
  - debian/control
     + Add breaks on geany-plugins-common << 0.20
* Also fixes bugs:
  - Filter for MATLAB/Octave files filters everythign (LP: 885505)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/makefile.win32
32
32
 
33
33
INCLUDEDIRS=  -I.. \
34
34
              -I../scintilla/include \
 
35
              -I../tagmanager/mio \
35
36
              -I../tagmanager/include \
36
37
              $(GTK_INCLUDES)
37
38
 
38
39
ALL_GTK_LIBS= \
39
40
        -L"$(PREFIX)/lib" \
40
41
        -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \
41
 
        -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl
 
42
        -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lgthread-2.0 -lintl \
 
43
        -lcairo -lpangocairo-1.0 -lgio-2.0
42
44
        # these things are for GTK >= 2.8
43
45
        # (should be same as with MSYS: pkg-config --libs gtk+-2.0 gthread-2.0)
44
46
        #"$(PREFIX)/lib/libcairo.dll.a" \
45
47
        #"$(PREFIX)/lib/asprintf.lib" \
46
48
        #"$(PREFIX)/lib/charset.lib" \
47
49
 
48
 
ifdef GTK280
49
 
ALL_GTK_LIBS +=-liconv
50
 
else
51
 
ALL_GTK_LIBS +=-lcairo -lpangocairo-1.0 -lgio-2.0
52
 
endif
53
 
 
54
50
WIN_LIBS=-mwindows -lole32 -luuid -liberty -lwsock32
55
51
 
56
52
CBASEFLAGS=-Wall -pipe -mms-bitfields $(DEFINES) $(INCLUDEDIRS)
90
86
binclean:
91
87
        $(RM) $(TARGET)
92
88
 
93
 
$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/tagmanager.a
 
89
$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/mio/mio.a ../tagmanager/tagmanager.a
94
90
        $(CXX) $(OBJS) $(RES) -o $(TARGET) \
95
 
        ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(ALL_GTK_LIBS) \
96
 
         $(WIN_LIBS)
 
91
        ../scintilla/scintilla.a ../tagmanager/tagmanager.a ../tagmanager/mio/mio.a \
 
92
        $(ALL_GTK_LIBS) $(WIN_LIBS)
97
93
 
98
94
deps.mak:
99
95
        $(CC) -MM  $(CFLAGS) *.c >deps.mak