diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2010-05-09 23:00:16 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@member.fsf.org> | 2010-05-09 23:00:16 (GMT) |
| commit | 639459e147c7b0efcbd4abd2e56a38259441e552 (patch) | |
| tree | 4e06c82152d1b678ec7ba4e5e447cbfed6535f40 /Makefile | |
| parent | aaf2912d8314141fb5e7567418f439cb50153210 (diff) | |
Initial sugar integration
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -194,6 +194,10 @@ NOSVGFLAG:=$(if $(SVG_LIB),,-DNOSVG$(warning No SVG for you!)) # SVG support uses libcairo1 OLDSVGFLAG:=$(if $(filter -lsvg-cairo,$(SVG_LIB)),-DOLD_SVG,) +# Sugar DE support +SUGAR_CFLAGS = $(if $(SUGAR), $(shell $(PKG_CONFIG) --cflags sugar-env sugar-ds sugar-shell)) +SUGAR_LIBS = $(if $(SUGAR), $(shell $(PKG_CONFIG) --libs sugar-env sugar-ds sugar-shell)) +SUGAR_OBJS = $(if $(SUGAR), obj/sugar.o) ifeq ($(hack),1) hack: @@ -228,7 +232,7 @@ DEFS:=-DVER_DATE=\"$(VER_DATE)\" -DVER_VERSION=\"$(VER_VERSION)\" \ -DCONFDIR=\"$(patsubst $(DESTDIR)%,%,$(CONFDIR))/\" \ -DMAGIC_PREFIX=\"$(patsubst $(DESTDIR)%,%,$(MAGIC_PREFIX))/\" \ $(NOSOUNDFLAG) $(NOSVGFLAG) $(OLDSVGFLAG) $(NOPANGOFLAG) \ - $(MAEMOFLAG) + $(MAEMOFLAG) $(if $(SUGAR), -DSUGAR) DEBUG_FLAGS:= #DEBUG_FLAGS:=-g @@ -913,13 +917,13 @@ install-man: tuxpaint: obj/tuxpaint.o obj/i18n.o obj/im.o obj/cursor.o obj/pixels.o \ obj/rgblinear.o obj/playsound.o obj/fonts.o obj/parse.o \ - obj/progressbar.o obj/dirwalk.o obj/get_fname.o \ + obj/progressbar.o obj/dirwalk.o obj/get_fname.o $(SUGAR_OBJS) \ $(ARCH_LIBS) @echo @echo "...Linking Tux Paint..." $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \ -o tuxpaint $^ \ - $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) + $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) $(SUGAR_LIBS) @$(RSRC_CMD) @$(MIMESET_CMD) @@ -934,6 +938,7 @@ obj/tuxpaint.o: src/tuxpaint.c \ src/tools.h src/titles.h src/colors.h src/shapes.h \ src/sounds.h src/tip_tux.h src/great.h \ src/tp_magic_api.h src/parse.h \ + src/sugar.h \ src/$(MOUSEDIR)/arrow.xbm src/$(MOUSEDIR)/arrow-mask.xbm \ src/$(MOUSEDIR)/hand.xbm src/$(MOUSEDIR)/hand-mask.xbm \ src/$(MOUSEDIR)/insertion.xbm \ @@ -1061,6 +1066,11 @@ obj/resource.o: win32/resources.rc win32/resource.h @echo "...Compiling win32 resources..." @$(WINDRES) -i win32/resources.rc -o obj/resource.o +obj/sugar.o: src/sugar.c src/sugar.h + @echo + @echo "...Compiling sugar support..." + @$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SUGAR_CFLAGS) $(DEFS) \ + -c src/sugar.c -o obj/sugar.o src/tp_magic_api.h: src/tp_magic_api.h.in @echo |