XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

Edited some dependencies and makefiles

Browse Source 
git-svn-id: svn://kolibrios.org@4769 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
right-hearted 2014-04-04 22:14:22 +00:00
parent 88ffef6c2e
commit 3a7084c9c9
4 changed files with 71 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/media/updf/Makefile
View File

@ -10,7 +10,7 @@ GEN := generated
default: all default: all
LDFLAGS = -T./include/scripts/menuetos_app_v01.ld -nostdlib -L ./include/lib -melf_i386 LDFLAGS = -T./include/scripts/menuetos_app_v01.ld -nostdlib -L ./include/lib -melf_i386
CFLAGS += -Ifitz -Ipdf -Ixps -Iscripts -fno-stack-protector -nostdinc -fno-builtin -m32 -I./include -fno-pic CFLAGS += -Ifitz -Ipdf -Ixps -Iscripts -fno-stack-protector -nostdinc -fno-builtin -m32 -I./include -fno-pic
LIBS += -lfreetype2 -lpng -ljbig2dec -ljpeg -lopenjpeg -lz -lm -lc LIBS += -lfreetype2 -lpng -ljbig2dec -ljpeg -lopenjpeg -lz -lm -lc -m32
#include Makerules #include Makerules
#include Makethird #include Makethird
@ -152,7 +152,10 @@ install: $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(PDF_APPS) $(XPS_APPS) $(MUPDF)
# --- Clean and Default --- # --- Clean and Default ---
all: $(THIRD_LIBS) $(FITZ_LIB) $(PDF_APPS) $(XPS_APPS) $(MUPDF) all: crt0 scripts $(THIRD_LIBS) $(FITZ_LIB) $(PDF_APPS) $(XPS_APPS) $(MUPDF)
crt0:
$(MAKE) -C ./stub
clean: clean:
rm -rf $(OUT) rm -rf $(OUT)

16
contrib/media/updf/stub/Makefile
View File

@ -1,18 +1,18 @@
include $(MENUETDEV)/osrules.mak include osrules.mak
.SUFFIXES: .asm; .SUFFIXES: .asm;
OBJS = crt0.o OBJS = crt0.o
all: $(OBJS) all: $(OBJS)
ifdef ON_WINDOWS ifdef ON_WINDOWS
crt0.o: crt0_$(STUBFMT).asm crt0.o: crt0_$(STUBFMT).asm
fasm crt0_$(STUBFMT).asm crt0.o fasm crt0_$(STUBFMT).asm crt0.o
else else
crt0.o: crt0_$(STUBFMT)_nounderscores.asm crt0.o: crt0_$(STUBFMT)_nounderscores.asm
fasm crt0_$(STUBFMT)_nounderscores.asm crt0.o fasm crt0_$(STUBFMT)_nounderscores.asm crt0.o
endif endif
clean: clean:
$(RM) $(OBJS) $(RM) $(OBJS)

BIN
contrib/media/updf/stub/crt0.o
View File

Binary file not shown.

58
contrib/media/updf/stub/osrules.mak Executable file
View File

@ -0,0 +1,58 @@
ifdef windir
ON_WINDOWS = 1
else
ifdef WINDIR
ON_WINDOWS = 1
endif
endif
ifndef ON_WINDOWS
VERSION_OS = linux
NEED_UNDERSCORES = undef
EXESUFFIX =
RM = rm -f
MV = mv
D_ECHO = echo
LIBDIR = $(MENUETDEV)/lib
ASMFMT = elf
else
ifdef HOME
VERSION_OS = cygwin
NEED_UNDERSCORES = define
EXESUFFIX = .exe
RM = rm -f
MV = mv
D_ECHO = echo
LIBDIR = $(MENUETDEV)/lib
ASMFMT = elf
else
VERSION_OS = MinGW
NEED_UNDERSCORES = define
EXESUFFIX = .exe
RM = del
MV = move
D_ECHO = echo.
ON_MINGW = 1
LIBDIR = $(MENUETDEV)\lib
ASMFMT = coff
endif
endif
HAS_DEVENV = 0
GPP_TOOLNAME = g++
STUBFMT = elf
MMKDEP = $(MENUETDEV)/linuxtools/mmkdep
MGCC = $(MENUETDEV)/linuxtools/mgcc
MGPP = $(MENUETDEV)/linuxtools/mgpp
MLD = $(MENUETDEV)/linuxtools/mld
MCHMEM = $(MENUETDEV)/linuxtools/mchmem
GCC32OPT =
AS32OPT =
LD32OPT =
ifneq (,$(findstring 64,$(shell gcc -dumpmachine)))
GCC32OPT = -m32
AS32OPT = --32
LD32OPT = -m$(ASMFMT)_i386
endif