From 3a7084c9c9b17e0fa8ec76a0cd1f77e319e1b41b Mon Sep 17 00:00:00 2001
From: right-hearted <right-hearted@kolibrios.org>
Date: Fri, 4 Apr 2014 22:14:22 +0000
Subject: [PATCH] Edited some dependencies and makefiles

git-svn-id: svn://kolibrios.org@4769 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 contrib/media/updf/Makefile         |   7 +++-
 contrib/media/updf/stub/Makefile    |  16 ++++----
 contrib/media/updf/stub/crt0.o      | Bin 675 -> 0 bytes
 contrib/media/updf/stub/osrules.mak |  58 ++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+), 10 deletions(-)
 delete mode 100644 contrib/media/updf/stub/crt0.o
 create mode 100755 contrib/media/updf/stub/osrules.mak

diff --git a/contrib/media/updf/Makefile b/contrib/media/updf/Makefile
index 7b2e4502f6..e7e59d757e 100644
--- a/contrib/media/updf/Makefile
+++ b/contrib/media/updf/Makefile
@@ -10,7 +10,7 @@ GEN := generated
 default: all
 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
-LIBS += -lfreetype2 -lpng -ljbig2dec -ljpeg -lopenjpeg -lz -lm -lc
+LIBS += -lfreetype2 -lpng -ljbig2dec -ljpeg -lopenjpeg -lz -lm -lc -m32
 
 #include Makerules
 #include Makethird
@@ -152,7 +152,10 @@ install: $(MUXPS_LIB) $(MUPDF_LIB) $(FITZ_LIB) $(PDF_APPS) $(XPS_APPS) $(MUPDF)
 
 # --- 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:
 	rm -rf $(OUT)
diff --git a/contrib/media/updf/stub/Makefile b/contrib/media/updf/stub/Makefile
index ecf3361235..105caf190a 100644
--- a/contrib/media/updf/stub/Makefile
+++ b/contrib/media/updf/stub/Makefile
@@ -1,18 +1,18 @@
-include $(MENUETDEV)/osrules.mak
-
+include osrules.mak
+
 .SUFFIXES: .asm;
 
 OBJS = crt0.o
 
 all: $(OBJS)
 
-ifdef ON_WINDOWS
+ifdef ON_WINDOWS
 crt0.o: crt0_$(STUBFMT).asm
-	fasm crt0_$(STUBFMT).asm crt0.o
-else
-crt0.o: crt0_$(STUBFMT)_nounderscores.asm
-	fasm crt0_$(STUBFMT)_nounderscores.asm crt0.o
-endif
+	fasm crt0_$(STUBFMT).asm crt0.o
+else
+crt0.o: crt0_$(STUBFMT)_nounderscores.asm
+	fasm crt0_$(STUBFMT)_nounderscores.asm crt0.o
+endif
 
 clean:
 	$(RM) $(OBJS)
diff --git a/contrib/media/updf/stub/crt0.o b/contrib/media/updf/stub/crt0.o
deleted file mode 100644
index 7d5f39cb51e7804eba2152f3fee6d6f3d13114fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 675
zcmaJ;%Sr<=6g}hEs^CIJLC{4PB3;N}!4GgVuGE!+8wsfmROrZ%NkQGH-_RfMAN)b@
zNhfU@!2>tvp8HB>?niljm1P+MGUQk);HMQAzMzjTI=Crs@5{UML0ku1O2sm=O|=2+
zkk^4j@)~eV?f^Y<SB?Y+k>*Q|R&?(BLTFF&r$GqwuCqj!iGED<B+{JsC3?S&QKM+y
zDyN6S&U&_HQaJPKPz;*}jnme_jI`5GsxmKA<CM~Mt!iy`rL;AF6K)*hPu2~TpE0eI
z{;|;`W20bYs^<CKL=XPo<*$?vkd@8B6`r&{Nw(s#E9X}0lODwSV$8FjyeY<2kaIDD
nb@K}EEatICHod^7c;8~Ob>GW*TovyOv&2PD8fSD`a1QYcyEH;9

diff --git a/contrib/media/updf/stub/osrules.mak b/contrib/media/updf/stub/osrules.mak
new file mode 100755
index 0000000000..af636fedfb
--- /dev/null
+++ b/contrib/media/updf/stub/osrules.mak
@@ -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