Index: branches/azimutz/Chazi/i386/libsaio/xml.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/xml.c (revision 982) +++ branches/azimutz/Chazi/i386/libsaio/xml.c (revision 983) @@ -27,6 +27,8 @@ #include "sl.h" #include "xml.h" +//getchar(); //getc(); Azi: getc stuff + //Azi: start - this code is unchanged since boot132, were it was exactly the same // as the one in drivers.c. Atm, the one in drivers.c has some more stuff; it could be // added on xml.h which is included on drivers.c and here?? Index: branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c (revision 982) +++ branches/azimutz/Chazi/i386/libsaio/acpi_patcher.c (revision 983) @@ -1107,7 +1107,7 @@ } #if DEBUG_ACPI printf("Press a key to continue... (DEBUG_ACPI)\n"); - getc(); + getchar(); //getc(); Azi: getc stuff #endif return 1; } Index: branches/azimutz/Chazi/i386/libsaio/Makefile =================================================================== --- branches/azimutz/Chazi/i386/libsaio/Makefile (revision 982) +++ branches/azimutz/Chazi/i386/libsaio/Makefile (revision 983) @@ -37,9 +37,11 @@ cpu.o platform.o acpi_patcher.o \ smbios.o smbios_getters.o smbios_decode.o \ fake_efi.o ext2fs.o \ - hpet.o dram_controllers.o spd.o usb.o pci_setup.o \ - device_inject.o nvidia.o ati.o pci_root.o \ - convert.o aml_generator.o console.o + usb.o pci_setup.o \ + device_inject.o pci_root.o convert.o aml_generator.o console.o \ + nvidia_resolution.o ati_resolution.o gma_resolution.o \ + autoresolution.o edid.o +# mem.o smbios_patcher.o - Kabyl LIBS = libsaio.a LIBS := $(addprefix $(SYMROOT)/, $(LIBS)) Index: branches/azimutz/Chazi/i386/libsaio/sys.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/sys.c (revision 982) +++ branches/azimutz/Chazi/i386/libsaio/sys.c (revision 983) @@ -451,7 +451,7 @@ if ((iob[i].i_flgs != F_ALLOC) || (i == fdesc)) { continue; } - io->i_buf = max(iob[i].i_filesize + iob[i].i_buf, io->i_buf); + io->i_buf = MAX(iob[i].i_filesize + iob[i].i_buf, io->i_buf); } // Load entire file into memory. Unnecessary open() calls must be avoided. @@ -822,7 +822,7 @@ * to override the default selection. * We accept only kBVFlagSystemVolume or kBVFlagForeignBoot volumes. */ - char *val = XMLDecode(getStringForKey(kDefaultPartition, &bootInfo->bootConfig)); + char *val = XMLDecode(getStringForKey(kDefaultPartitionKey, &bootInfo->bootConfig)); if (val) { for ( bvr = chain; bvr; bvr = bvr->next ) { if (matchVolumeToString(bvr, val, false)) { Index: branches/azimutz/Chazi/i386/libsaio/load.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/load.c (revision 982) +++ branches/azimutz/Chazi/i386/libsaio/load.c (revision 983) @@ -137,7 +137,7 @@ printf("ncmds: %x\n", (unsigned)mH->ncmds); printf("sizeofcmds: %x\n", (unsigned)mH->sizeofcmds); printf("flags: %x\n", (unsigned)mH->flags); - getc(); + getchar(); //getc(); Azi: getc stuff #endif ncmds = mH->ncmds; @@ -221,7 +221,7 @@ printf("segname: %s, vmaddr: %x, vmsize: %x, fileoff: %x, filesize: %x, nsects: %d, flags: %x.\n", segCmd->segname, (unsigned)vmaddr, (unsigned)vmsize, (unsigned)fileaddr, (unsigned)filesize, (unsigned) segCmd->nsects, (unsigned)segCmd->flags); - getc(); + getchar(); //getc(); Azi: getc stuff #endif } else @@ -241,7 +241,7 @@ printf("segname: %s, vmaddr: %x, vmsize: %x, fileoff: %x, filesize: %x, nsects: %d, flags: %x.\n", segCmd->segname, (unsigned)vmaddr, (unsigned)vmsize, (unsigned)fileaddr, (unsigned)filesize, (unsigned) segCmd->nsects, (unsigned)segCmd->flags); - getc(); + getchar(); //getc(); Azi: getc stuff #endif } @@ -325,7 +325,7 @@ #ifdef DEBUG printf("symoff: %x, nsyms: %x, stroff: %x, strsize: %x\n", symTab->symoff, symTab->nsyms, symTab->stroff, symTab->strsize); - getc (); + getchar(); //getc(); Azi: getc stuff #endif symsSize = symTab->stroff - symTab->symoff; Index: branches/azimutz/Chazi/i386/libsaio/disk.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/disk.c (revision 982) +++ branches/azimutz/Chazi/i386/libsaio/disk.c (revision 983) @@ -1649,7 +1649,7 @@ printf(" bvr: %d, dev: %d, part: %d, flags: %d, vis: %d\n", bvr, bvr->biosdev, bvr->part_no, bvr->flags, bvr->visible); } printf("count: %d\n", bvCount); - getc(); + getchar(); //getc(); Azi: getc stuff #endif *count = bvCount; Index: branches/azimutz/Chazi/i386/libsaio/cpu.h =================================================================== --- branches/azimutz/Chazi/i386/libsaio/cpu.h (revision 982) +++ branches/azimutz/Chazi/i386/libsaio/cpu.h (revision 983) @@ -6,7 +6,7 @@ #ifndef __LIBSAIO_CPU_H #define __LIBSAIO_CPU_H -//#include "libsaio.h" - enabled on trunk +//#include "libsaio.h" - enabled on trunk ?? extern void scan_cpu(PlatformInfo_t *); Index: branches/azimutz/Chazi/i386/libsaio/biosfn.c =================================================================== --- branches/azimutz/Chazi/i386/libsaio/biosfn.c (revision 982) +++ branches/azimutz/Chazi/i386/libsaio/biosfn.c (revision 983) @@ -254,10 +254,10 @@ #if DEBUG { int i; - printf("%d total ranges\n", count);getc(); + printf("%d total ranges\n", count); getchar(); //getc(); Azi: getc stuff for (i=0, range = rangeArray; itype, (unsigned int)range->base, (unsigned int)range->length); getc(); + range->type, (unsigned int)range->base, (unsigned int)range->length); getchar(); //getc(); Azi: getc stuff } } #endif @@ -511,7 +511,7 @@ printf("media_type: %x\n", pkt.media_type); printf("drive_num: %x\n", pkt.drive_num); printf("device_spec: %x\n", pkt.device_spec); - printf("press a key->\n");getc(); + printf("press a key->\n"); getchar(); //getc(); Azi: getc stuff #endif /* Some BIOSes erroneously return cf = 1 */ @@ -676,7 +676,7 @@ print_drive_info(di); printf("uses_ebios = 0x%x\n", dp->uses_ebios); printf("result %d\n", ret); - printf("press a key->\n");getc(); + printf("press a key->\n"); getchar(); //getc(); Azi: getc stuff #endif if (ret == 0) { Index: branches/azimutz/Chazi/i386/libsaio/saio_internal.h =================================================================== --- branches/azimutz/Chazi/i386/libsaio/saio_internal.h (revision 982) +++ branches/azimutz/Chazi/i386/libsaio/saio_internal.h (revision 983) @@ -49,7 +49,7 @@ extern int ebiosEjectMedia(int biosdev); extern void bios_putchar(int ch); extern void putca(int ch, int attr, int repeat); -extern int getc(void); +//extern int getc(void); Azi: getc stuff extern void pause(); extern int readKeyboardStatus(void); extern int readKeyboardShiftFlags(void); Index: branches/azimutz/Chazi/i386/boot2/resume.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/resume.c (revision 982) +++ branches/azimutz/Chazi/i386/boot2/resume.c (revision 983) @@ -118,7 +118,7 @@ printf ("Resuming from Encrypted image is unsupported.\n" "Uncheck \"Use secure virtual memory\" in \"Security\" pane on system preferences.\n" "Press any key to proceed with normal boot.\n"); - getc (); + getchar(); //getc(); Azi: getc stuff return; } // depends on NVRAM @@ -145,7 +145,7 @@ if ( (long long)mem_base + allocSize < 1024*bootInfo->extmem + 0x100000 ) { printf("Not enough space to restore image. Press any key to proceed with normal boot.\n"); - getc(); + getchar(); //getc(); Azi: getc stuff return; } Index: branches/azimutz/Chazi/i386/boot2/boot.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/boot.c (revision 982) +++ branches/azimutz/Chazi/i386/boot2/boot.c (revision 983) @@ -397,7 +397,7 @@ //printf msglog(":something...???\n Default: %d, ->biosdev: %d, ->part_no: %d ->flags: %d\n", gBootVolume, gBootVolume->biosdev, gBootVolume->part_no, gBootVolume->flags); msglog(" bt(0,0): %d, ->biosdev: %d, ->part_no: %d ->flags: %d\n", gBIOSBootVolume, gBIOSBootVolume->biosdev, gBIOSBootVolume->part_no, gBIOSBootVolume->flags); -// getc(); +// getchar(); //getc(); Azi: getc stuff - DON'T FORGET pause() - take modules.c as reference. //#endif useGUI = true; Index: branches/azimutz/Chazi/i386/boot2/modules.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/modules.c (revision 982) +++ branches/azimutz/Chazi/i386/boot2/modules.c (revision 983) @@ -7,8 +7,9 @@ #define CONFIG_MODULE_DEBUG 0 #endif +//#include "bootstruct.h" #include "boot.h" -#include "bootstruct.h" +#include "memory.h" #include "modules.h" #include "boot_modules.h" #include Index: branches/azimutz/Chazi/i386/boot2/gui.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/gui.c (revision 982) +++ branches/azimutz/Chazi/i386/boot2/gui.c (revision 983) @@ -1634,7 +1634,7 @@ updateVRAM(); - key = getc(); + key = getchar(); //getc(); Azi: getc stuff if( key == kUpArrowkey ) if( currentline > 0 ) Index: branches/azimutz/Chazi/i386/boot2/ramdisk.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/ramdisk.c (revision 982) +++ branches/azimutz/Chazi/i386/boot2/ramdisk.c (revision 983) @@ -278,7 +278,7 @@ showInfoRAMDisk(); //Azi: check Chazileon on these line breaks here*** printf("\n\nPress any key to continue.\n"); - getc(); + getchar(); //getc(); Azi: getc stuff setActiveDisplayPage(0); } else @@ -291,7 +291,7 @@ printf("\n?rd m - mount ramdisk image\n?rd u - unmount ramdisk image"); printf("\n?rd e - enable bt(0,0) alias\n?rd d - disable bt(0,0) alias"); printf("\n\nPress any key to continue.\n"); - getc(); + getchar(); //getc(); Azi: getc stuff setActiveDisplayPage(0); } } Index: branches/azimutz/Chazi/i386/boot2/options.c =================================================================== --- branches/azimutz/Chazi/i386/boot2/options.c (revision 982) +++ branches/azimutz/Chazi/i386/boot2/options.c (revision 983) @@ -924,7 +924,7 @@ // reset cursor co-ords gui.debug.cursor = pos( gui.screen.width - 160 , 10 ); } - key = getc(); + key = getchar(); //getc(); Azi: getc stuff updateMenu( key, (void **) &menuBVR ); newShowPrompt = (gDeviceCount == 0) || (menuBVR->flags & kBVFlagNativeBoot); @@ -1489,7 +1489,7 @@ printf("[Type %s%sq to quit viewer]", (line_offset > 0) ? "p for previous page, " : "", (*bp != '\1') ? "space for next page, " : ""); } - c = getc(); + c = getchar(); //getc(); Azi: getc stuff if (c == 'q' || c == 'Q') { break; } @@ -1562,7 +1562,7 @@ printf("Typical boot devices are 80 (First HD), 81 (Second HD)\n"); printf("Enter two-digit hexadecimal boot device [%02x]: ", bootdevice); do { - key = getc(); + key = getchar(); //getc(); Azi: getc stuff switch (key & kASCIIKeyMask) { case kBackspaceKey: if (digitsI > 0) { @@ -1613,7 +1613,7 @@ bool promptForRescanOption(void) { printf("\nWould you like to enable media rescan option?\nPress ENTER to enable or any key to skip.\n"); - if (getc() == kReturnKey) { + if ( getchar()/*getc(); Azi: getc stuff*/ == kReturnKey) { return true; } else { return false; Index: branches/azimutz/Chazi/i386/modules/HPET/HPET.c =================================================================== --- branches/azimutz/Chazi/i386/modules/HPET/HPET.c (revision 982) +++ branches/azimutz/Chazi/i386/modules/HPET/HPET.c (revision 983) @@ -104,7 +104,7 @@ } /*#if DEBUG_HPET - pause(); + pause(); - getchar(); //getc(); Azi: getc stuff #endif*/ } Index: branches/azimutz/Chazi/i386/modules/HPET/Cconfig =================================================================== --- branches/azimutz/Chazi/i386/modules/HPET/Cconfig (revision 0) +++ branches/azimutz/Chazi/i386/modules/HPET/Cconfig (revision 983) @@ -0,0 +1,10 @@ +# +# Chameleon Modules +# + +config HPET_MODULE + tristate "HPET Module" + default m + ---help--- + Say Y here if you want to enable to use of this module. + Index: branches/azimutz/Chazi/i386/modules/HPET/Makefile =================================================================== --- branches/azimutz/Chazi/i386/modules/HPET/Makefile (revision 982) +++ branches/azimutz/Chazi/i386/modules/HPET/Makefile (revision 983) @@ -1,44 +1,14 @@ - MODULE_NAME = HPET +MODULE_AUTHOR = Chameleon +MODULE_DESCRIPTION = --- MODULE_VERSION = "1.0.0" MODULE_COMPAT_VERSION = "1.0.0" -MODULE_START = _$(MODULE_NAME)_start +MODULE_START = $(MODULE_NAME)_start MODULE_DEPENDENCIES = + DIR = HPET MODULE_OBJS = HPET.o -OPTIM = -Os -Oz -DEBUG = -DNOTHING -#DEBUG = -DDEBUG_HELLO_WORLD=1 -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost \ - -D__ARCHITECTURE__=\"i386\" -DSAIO_INTERNAL_USER \ - -DRCZ_COMPRESSED_FILE_SUPPORT $(DEBUG) \ - -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ - -mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \ - -march=pentium4 -msse2 -mfpmath=sse -msoft-float -fno-common - -DEFINES= -CONFIG = hd -INC = -I. -I.. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(BOOT2DIR) -LIBS= - -VPATH = $(OBJROOT):$(SYMROOT) - - - -SFILES = -CFILES = -HFILES = -EXPORTED_HFILES = -INSTALLED_HFILES = -OTHERFILES = Makefile -ALLSRC = $(SFILES) $(CFILES) \ - $(HFILES) $(OTHERFILES) -DIRS_NEEDED = $(OBJROOT) $(SYMROOT) - -all embedtheme: dylib - - include ../MakeInc.dir \ No newline at end of file Index: branches/azimutz/Chazi/i386/modules/Resolution/915resolution.c =================================================================== --- branches/azimutz/Chazi/i386/modules/Resolution/915resolution.c (revision 982) +++ branches/azimutz/Chazi/i386/modules/Resolution/915resolution.c (revision 983) @@ -182,7 +182,7 @@ if((id & 0x0000FFFF) == 0x00008086) // Intel chipset { //printf("Unknown chipset 0x%llX, please email id to meklort@gmail.com", id); - //getchar(); + //getchar(); //getc(); Azi: getc stuff type = CT_UNKNOWN_INTEL; //type = CT_UNKNOWN; Index: branches/azimutz/Chazi/i386/modules/Resolution/Cconfig =================================================================== --- branches/azimutz/Chazi/i386/modules/Resolution/Cconfig (revision 982) +++ branches/azimutz/Chazi/i386/modules/Resolution/Cconfig (revision 983) @@ -4,7 +4,8 @@ config RESOLUTION_MODULE tristate "Resolution Module" - default m + default n +# 'n' doesn't work?? ---help--- Say Y here if you want to enable to use of this module. Index: branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c =================================================================== --- branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c (revision 982) +++ branches/azimutz/Chazi/i386/modules/KernelPatcher/kernel_patcher.c (revision 983) @@ -214,7 +214,7 @@ int locate_symbols(void* kernelData) { char is64 = 1; - parse_mach(kernelData, NULL, symbol_handler); + parse_mach(kernelData, NULL, symbol_handler, NULL); //handle_symtable((UInt32)kernelData, symtableData, &symbol_handler, determineKernelArchitecture(kernelData) == KERNEL_64); return 1 << is64; } @@ -385,12 +385,12 @@ // Total: 24 bytes printf("Running on a 10.2.0+ kernel\n"); -// getc(); +// getchar(); //getc(); Azi: getc stuff } else { printf("Running on a 10.0.0 kernel, patch unsupported\n"); - getc(); + getchar(); //getc(); Azi: getc stuff } Index: branches/azimutz/Chazi/i386/modules/KernelPatcher/Cconfig =================================================================== --- branches/azimutz/Chazi/i386/modules/KernelPatcher/Cconfig (revision 0) +++ branches/azimutz/Chazi/i386/modules/KernelPatcher/Cconfig (revision 983) @@ -0,0 +1,10 @@ +# +# Chameleon Modules +# + +config KERNELPATCHER_MODULE + tristate "KernelPatcher Module" + default m + ---help--- + Say Y here if you want to enable to use of this module. + Index: branches/azimutz/Chazi/i386/modules/KernelPatcher/Makefile =================================================================== --- branches/azimutz/Chazi/i386/modules/KernelPatcher/Makefile (revision 982) +++ branches/azimutz/Chazi/i386/modules/KernelPatcher/Makefile (revision 983) @@ -1,42 +1,14 @@ MODULE_NAME = KernelPatcher +MODULE_AUTHOR = Chameleon +MODULE_DESCRIPTION = --- MODULE_VERSION = "1.0.0" MODULE_COMPAT_VERSION = "1.0.0" -MODULE_START = _$(MODULE_NAME)_start +MODULE_START = $(MODULE_NAME)_start MODULE_DEPENDENCIES = + DIR = KernelPatcher MODULE_OBJS = kernel_patcher.o -OPTIM = -O3 -DEBUG = -DNOTHING -#DEBUG = -DDEBUG_HELLO_WORLD=1 -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost \ - -D__ARCHITECTURE__=\"i386\" -DSAIO_INTERNAL_USER \ - -DRCZ_COMPRESSED_FILE_SUPPORT $(DEBUG) \ - -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ - -mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \ - -march=pentium4 -msse2 -mfpmath=sse -msoft-float -fno-common - -DEFINES= -CONFIG = hd -INC = -I. -I.. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(BOOT2DIR) -LIBS= - -VPATH = $(OBJROOT):$(SYMROOT) - - - -SFILES = -CFILES = -HFILES = -EXPORTED_HFILES = -INSTALLED_HFILES = -OTHERFILES = Makefile -ALLSRC = $(SFILES) $(CFILES) \ - $(HFILES) $(OTHERFILES) -DIRS_NEEDED = $(OBJROOT) $(SYMROOT) - -all embedtheme: dylib - include ../MakeInc.dir \ No newline at end of file Index: branches/azimutz/Chazi/i386/modules/Cconfig =================================================================== --- branches/azimutz/Chazi/i386/modules/Cconfig (revision 982) +++ branches/azimutz/Chazi/i386/modules/Cconfig (revision 983) @@ -3,10 +3,13 @@ # menu "Modules" -source "i386/modules/Resolution/Cconfig" source "i386/modules/klibc/Cconfig" source "i386/modules/uClibcxx/Cconfig" source "i386/modules/HelloWorld/Cconfig" +source "i386/modules/Memory/Cconfig" +source "i386/modules/HPET/Cconfig" +source "i386/modules/KernelPatcher/Cconfig" +source "i386/modules/Resolution/Cconfig" source "i386/modules/GraphicsEnabler/AMDGraphicsEnabler/Cconfig" source "i386/modules/GraphicsEnabler/ATiGraphicsEnabler/Cconfig" source "i386/modules/GraphicsEnabler/IntelGraphicsEnabler/Cconfig" Index: branches/azimutz/Chazi/i386/modules/Memory/spd.c =================================================================== --- branches/azimutz/Chazi/i386/modules/Memory/spd.c (revision 982) +++ branches/azimutz/Chazi/i386/modules/Memory/spd.c (revision 983) @@ -328,7 +328,7 @@ slot->SerialNo); #if DEBUG_SPD dumpPhysAddr("spd content: ",slot->spd, spd_size); - getc(); + getchar(); //getc(); Azi: getc stuff #endif } Index: branches/azimutz/Chazi/i386/modules/Memory/Cconfig =================================================================== --- branches/azimutz/Chazi/i386/modules/Memory/Cconfig (revision 0) +++ branches/azimutz/Chazi/i386/modules/Memory/Cconfig (revision 983) @@ -0,0 +1,11 @@ +# +# Chameleon Modules +# + +config MEMORY_MODULE + tristate "MEMORY Module" + default m + depends on KLIBC_MODULE + ---help--- + Say Y here if you want to enable to use of this module. + Index: branches/azimutz/Chazi/i386/modules/Memory/Makefile =================================================================== --- branches/azimutz/Chazi/i386/modules/Memory/Makefile (revision 982) +++ branches/azimutz/Chazi/i386/modules/Memory/Makefile (revision 983) @@ -1,41 +1,15 @@ MODULE_NAME = Memory +MODULE_AUTHOR = Chameleon +MODULE_DESCRIPTION = --- MODULE_VERSION = "1.0.0" MODULE_COMPAT_VERSION = "1.0.0" -MODULE_START = _$(MODULE_NAME)_start +MODULE_START = $(MODULE_NAME)_start MODULE_DEPENDENCIES = klibc + DIR = Memory MODULE_OBJS = dram_controllers.o spd.o Memory.o # mem.o -OPTIM = -Os -Oz -DEBUG = -DNOTHING -#DEBUG = -DDEBUG_HELLO_WORLD=1 -CFLAGS = $(RC_CFLAGS) $(OPTIM) $(MORECPP) -arch i386 -g -Wmost \ - -D__ARCHITECTURE__=\"i386\" -DSAIO_INTERNAL_USER \ - -DRCZ_COMPRESSED_FILE_SUPPORT $(DEBUG) \ - -fno-builtin $(OMIT_FRAME_POINTER_CFLAG) \ - -mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \ - -march=pentium4 -msse2 -mfpmath=sse -msoft-float -fno-common - -DEFINES= -CONFIG = hd -INC = -I. -I.. -I$(SYMROOT) -I$(UTILDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I$(BOOT2DIR) -LIBS= - -VPATH = $(OBJROOT):$(SYMROOT) - -SFILES = -CFILES = -HFILES = -EXPORTED_HFILES = -INSTALLED_HFILES = -OTHERFILES = Makefile -ALLSRC = $(SFILES) $(CFILES) \ - $(HFILES) $(OTHERFILES) -DIRS_NEEDED = $(OBJROOT) $(SYMROOT) - -all embedtheme: dylib - include ../MakeInc.dir \ No newline at end of file Index: branches/azimutz/Chazi/i386/modules/Makefile =================================================================== --- branches/azimutz/Chazi/i386/modules/Makefile (revision 982) +++ branches/azimutz/Chazi/i386/modules/Makefile (revision 983) @@ -11,11 +11,24 @@ include ${SRCROOT}/Make.rules # The order of building is important. -SUBDIRS = klibc uClibcxx Resolution HelloWorld \ +SUBDIRS = klibc uClibcxx KernelPatcher Memory HPET \ GraphicsEnabler/ATiGraphicsEnabler GraphicsEnabler/AMDGraphicsEnabler \ - GraphicsEnabler/NVIDIAGraphicsEnabler GraphicsEnabler/IntelGraphicsEnabler + GraphicsEnabler/NVIDIAGraphicsEnabler GraphicsEnabler/IntelGraphicsEnabler \ + HelloWorld Resolution +# - - Resolution (only tested on Meklort's branch, never did any good for my resolution; +# conflicts with AutoResolution - fix! ) +# - - AMDGraphicsEnabler (no support for ATI legacy cards, e.g. 1000 series) +# testing = http://www.insanelymac.com/forum/index.php?s=&showtopic=231075&view=findpost&p=1683785 +# - - Memory ("Attempting to execute hook ScanMemory" +# Divide by 0 +# "This is a non recoverable error! System HALTED!!!") +# (Based on previous tests whith Meklort's branch; here just instant reboots. XCode 4 SPECIFIC!!) + +# - - KernelPatcher (hangs right after loading the kernel. XCode 4 SPECIFIC!!) + + CFLAGS= -O3 $(MORECPP) -arch i386 -g -static DEFINES= CONFIG = hd Index: branches/azimutz/Chazi/i386/Makefile =================================================================== --- branches/azimutz/Chazi/i386/Makefile (revision 982) +++ branches/azimutz/Chazi/i386/Makefile (revision 983) @@ -51,7 +51,7 @@ "RC_CFLAGS=$(RC_CFLAGS)" $@ \ ) || exit $$?; \ done - + config rebuild_config: @for i in config; \ do \