Chameleon

Chameleon Commit Details

Date:2011-06-14 05:24:52 (8 years 2 months ago)
Author:Azimutz
Commit:1011
Parents: 1010
Message:Sync with trunk (r1010). Finally... svn:mergeinfo madness gone.
Changes:
M/branches/azimutz/trunkAutoResolution/i386/boot2/Makefile
M/branches/azimutz/trunkAutoResolution/i386/config/Makefile
M/branches/azimutz/trunkAutoResolution
M/branches/azimutz/trunkAutoResolution/i386/boot2/bmdecompress.c
M/branches/azimutz/trunkAutoResolution/i386/boot2/gui.c
M/branches/azimutz/trunkAutoResolution/i386/Makefile

File differences

branches/azimutz/trunkAutoResolution/i386/boot2/Makefile
2323
2424
2525
26
26
2727
2828
2929
......
4343
4444
4545
46
46
47
4748
4849
4950
......
112113
113114
114115
115
116116
117117
118118
......
122122
123123
124124
125
126125
127
128
129
130126
131127
132
128
129
133130
134131
135
136132
137133
138134
......
145141
146142
147143
148
149144
150145
151146
......
153148
154149
155150
156
151
157152
158153
159154
160155
161
162156
163157
164158
-fno-builtin -DSAIO_INTERNAL_USER -static $(OMIT_FRAME_POINTER_CFLAG) \
-mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \
-march=pentium4 -msse2 -mfpmath=sse -msoft-float -nostdinc -include $(SRCROOT)/autoconf.h
CPPFLAGS := $(CPPFLAGS) -nostdinc++ -include $(SRCROOT)/autoconf.h
DEFINES=
# The ordering is important;
# boot2.o must be first.
OBJS = boot2.o boot.o graphics.o drivers.o prompt.o options.o lzss.o mboot.o \
ramdisk.o picopng.o resume.o bmdecompress.o graphic_utils.o gui.o modules.o modules_support.o boot_modules.o
ramdisk.o picopng.o resume.o bmdecompress.o graphic_utils.o gui.o modules.o \
modules_support.o boot_modules.o
# button.o browser.o scrollbar.o == NOTYET
UTILDIR = ../util
@${RM} $(SYMROOT)/${SYMBOLS_MODULE}
@$(LD) -arch i386 \
-undefined dynamic_lookup \
-dylib -read_only_relocs suppress \
-final_output Symbols \
-macosx_version_min 10.6 \
-o $(OBJROOT)/Symbols_LINKER_ONLY.dylib
endif
@make embed_symbols# this is done in a sub process after boot.sys exists so the strings are populated correctly
# this is done in a sub process after boot.sys exists so the strings are populated correctly
@make embed_symbols
@${RM} $(SYMROOT)/boot2.sys
@( size=`ls -l $(SYMROOT)/boot | awk '{ print $$5}'` ; \
if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ;\
echo "\t******* boot is $$size bytes *******"; \
fi)
embed_symbols:
ifeq (${CONFIG_MODULES}, y)
@echo ================= Embedding Symbols.dylib =================
@$(SYMROOT)/machOconv $(SYMROOT)/boot2.sys $(SYMROOT)/boot &> /dev/null
@echo "\t******* Patching at $(PATCH_ADDR) ******"
@stat -f%z $(SYMROOT)/boot | perl -ane "print pack('V',@F[0]);" | dd conv=notrunc of=${SYMROOT}/boot.sys bs=1 count=4 seek=$(PATCH_ADDR) &> /dev/null
@stat -f%z $(SYMROOT)/boot | perl -ane "print pack('V',@F[0]);" | dd conv=notrunc of=${SYMROOT}/boot.sys bs=1 count=4 seek=$(PATCH_ADDR) &> /dev/null
endif
@echo "\t[MACHOCONV] boot"
@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
$(SYMROOT)/art.h:
@if [ "$(PNGCRUSH)" ]; then\
echo "optimizing art files ...\n$(PNGCRUSH) $(PNGOPTIONS) artwork/$(THEME)"; \
branches/azimutz/trunkAutoResolution/i386/boot2/bmdecompress.c
1919
2020
2121
22
2223
2324
25
2426
2527
2628
*
* @APPLE_LICENSE_HEADER_END@
*/
#include "boot.h"
static void
PreviewDecompress16(uint32_t * compressBuffer,
uint32_t width, uint32_t height, uint32_t row,
branches/azimutz/trunkAutoResolution/i386/boot2/gui.c
10481048
10491049
10501050
1051
1051
10521052
10531053
10541054
10551055
10561056
10571057
1058
1058
10591059
10601060
10611061
}
}
struct putc_info //Azi: same as below
struct putc_info //Azi: exists on console.c & printf.c
{
char * str;
char * last_str;
};
static int
sputc(int c, struct putc_info * pi) //Azi: exists on console.c & printf.c
sputc(int c, struct putc_info * pi) //Azi: same as above
{
if (pi->last_str)
if (pi->str == pi->last_str) {
branches/azimutz/trunkAutoResolution/i386/config/Makefile
1515
1616
1717
18
19
20
1821
19
20
21
2222
2323
2424
25
2625
2726
28
29
3027
3128
3229
3330
3431
3532
36
37
38
3933
4034
4135
DIR = util
include ${SRCROOT}/Make.rules
OBJECTS = cconfig.o32 cconfig.o64 zconf.tab.o32 zconf.tab.o64 \
yesno.o32 yesno.o64 textbox.o32 textbox.o64 menubox.o32 \
menubox.o64 checklist.o32 checklist.o64 inputbox.o32 inputbox.o64
OBJECTS = cconfig.o32 cconfig.o64 zconf.tab.o32 zconf.tab.o64 yesno.o32 yesno.o64 textbox.o32 textbox.o64 menubox.o32 menubox.o64 checklist.o32 checklist.o64 inputbox.o32 inputbox.o64
DEFINES = -DKBUILD_NO_NLS -DCURSES_LOC=\<ncurses.h\> -DPATH_MAX=256 -DPACKAGE=\"chameleon\"
LDFLAGS = -lncurses -lmenu
PROGRAMS = cconfig
SYMPROG = $(addprefix $(SYMROOT)/, $(PROGRAMS))
DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
all: $(DIRS_NEEDED) $(SYMPROG)
$(SYMPROG): $(addprefix $(OBJROOT)/, $(OBJECTS))
@echo "\t[LD32] $(@F)_32"
@$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/*.o32
branches/azimutz/trunkAutoResolution/i386/Makefile
5151
5252
5353
54
54
5555
5656
5757
"RC_CFLAGS=$(RC_CFLAGS)" $@ \
) || exit $$?; \
done
config rebuild_config:
@for i in config; \
do \

Archive Download the corresponding diff file

Revision: 1011