Trying to add updf to autobuild. Trial #2

git-svn-id: svn://kolibrios.org@4703 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
right-hearted 2014-03-27 22:44:19 +00:00
parent 964bdc4fb2
commit 408fc46b4d

View File

@ -637,7 +637,7 @@ GEN := $(UPDFDIR)/generated
# --- Variables, Commands, etc... --- # --- Variables, Commands, etc... ---
LDFLAGS = -T$(UPDFDIR)/include/scripts/menuetos_app_v01.ld -nostdlib -L $(UPDFDIR)/include/lib -melf_i386 LDFLAGS = -T$(UPDFDIR)/include/scripts/menuetos_app_v01.ld -nostdlib -L $(UPDFDIR)/include/lib -melf_i386
CFLAGS += -Ifitz -Ipdf -Ixps -Iscripts -fno-stack-protector -nostdinc -fno-builtin -m32 -I include -fno-pic CFLAGS += -I$(UPDFDIR)/fitz -I$(UPDFDIR)/pdf -I$(UPDFDIR)/xps -I$(UPDFDIR)/scripts -fno-stack-protector -nostdinc -fno-builtin -m32 -I$(UPDFDIR)/include -fno-pic
LIBS += -lfreetype2 -lpng -ljbig2dec -ljpeg -lopenjpeg -lz -lm -lc LIBS += -lfreetype2 -lpng -ljbig2dec -ljpeg -lopenjpeg -lz -lm -lc
THIRD_LIBS := $(FREETYPE_LIB) THIRD_LIBS := $(FREETYPE_LIB)
@ -656,7 +656,7 @@ endif
CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $< CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
AR_CMD = $(QUIET_AR) $(AR) cru $@ $^ AR_CMD = $(QUIET_AR) $(AR) cru $@ $^
LINK_CMD = $(QUIET_LINK) ld $(LDFLAGS) -o $@ include/crt0.o $^ build/debug/snprintf.o $(LIBS) LINK_CMD = $(QUIET_LINK) ld $(LDFLAGS) -o $@ $(UPDFDIR)/include/crt0.o $^ $(UPDFDIR)/build/debug/snprintf.o $(LIBS)
MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@ MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
# --- Rules --- # --- Rules ---