WebSVN – Kolibri OS – Path Comparison – /

Regard whitespace Rev 5039 → Rev 5038

/drivers/video/vidintel.asm
File deleted

Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

 /kernel/trunk/kernel.asm
 ,7 → 918,7
 include "detect/vortex86.inc"                     ; Vortex86 SoC detection code
-        stdcall load_pe_driver, szVidintel, 0
+        stdcall load_driver, szVidintel
         call    usb_init

 /kernel/trunk/core/peload.inc
 ,30 → 24,15
         mov     [image], eax
-        mov     edx, [eax+STRIPPED_PE_HEADER.SizeOfImage]
-;        mov     cl, [eax+STRIPPED_PE_HEADER.Subsystem]
-        cmp     word [eax], STRIPPED_PE_SIGNATURE
-        jz      @f
         mov     edx, [eax+60]
-;        mov     cl, [eax+5Ch+edx]
-        mov     edx, [eax+80+edx]
-@@:
-        mov     [entry], 0
-;        cmp     cl, 1
-;        jnz     .cleanup
-        stdcall kernel_alloc, edx
+        stdcall kernel_alloc, [eax+80+edx]
         test    eax, eax
         jz      .cleanup
         mov     [base], eax
-        push    ebx ebp
-        mov     ebx, [image]
-        mov     ebp, eax
-        call    map_PE
-        pop     ebp ebx
+        stdcall map_PE, eax, [image]
         mov     [entry], eax
         test    eax, eax
 ,200 → 48,199
         ret
 endp
-map_PE:                    ;ebp=base:dword, ebx=image:dword
+DWORD equ dword
+PTR   equ
+align 4
+map_PE:                    ;stdcall base:dword, image:dword
+        cld
+        push    ebp
         push    edi
         push    esi
-        sub     esp, .locals_size
-virtual at esp
-.numsections    dd      ?
-.import_names   dd      ?
-.import_targets dd      ?
-.peheader       dd      ?
-.bad_import     dd      ?
-.import_idx     dd      ?
-.import_descr   dd      ?
-.relocs_rva     dd      ?
-.relocs_size    dd      ?
-.section_header_size dd ?
-.AddressOfEntryPoint    dd ?
-.ImageBase      dd      ?
-.locals_size = $ - esp
-end virtual
-        cmp     word [ebx], STRIPPED_PE_SIGNATURE
-        jz      .stripped
+        push    ebx
+        sub     esp, 60
+        mov     ebx, DWORD PTR [esp+84]
+        mov     ebp, DWORD PTR [esp+80]
         mov     edx, ebx
-        add     edx, [ebx+60]
-        movzx   eax, word [edx+6]
-        mov     [.numsections], eax
-        mov     eax, [edx+40]
-        mov     [.AddressOfEntryPoint], eax
-        mov     eax, [edx+52]
-        mov     [.ImageBase], eax
-        mov     ecx, [edx+84]
-        mov     [.section_header_size], 40
-        mov     eax, [edx+128]
-        mov     [.import_descr], eax
-        mov     eax, [edx+160]
-        mov     [.relocs_rva], eax
-        mov     eax, [edx+164]
-        mov     [.relocs_size], eax
-        add     edx, 256
-        jmp     .common
-.stripped:
-        mov     eax, [ebx+STRIPPED_PE_HEADER.AddressOfEntryPoint]
-        mov     [.AddressOfEntryPoint], eax
-        mov     eax, [ebx+STRIPPED_PE_HEADER.ImageBase]
-        mov     [.ImageBase], eax
-        movzx   eax, [ebx+STRIPPED_PE_HEADER.NumberOfSections]
-        mov     [.numsections], eax
-        movzx   ecx, [ebx+STRIPPED_PE_HEADER.NumberOfRvaAndSizes]
-        xor     eax, eax
-        mov     [.relocs_rva], eax
-        mov     [.relocs_size], eax
-        test    ecx, ecx
-        jz      @f
-        mov     eax, [ebx+sizeof.STRIPPED_PE_HEADER+SPE_DIRECTORY_IMPORT*8]
-@@:
-        mov     [.import_descr], eax
-        cmp     ecx, SPE_DIRECTORY_BASERELOC
-        jbe     @f
-        mov     eax, [ebx+sizeof.STRIPPED_PE_HEADER+SPE_DIRECTORY_BASERELOC*8]
-        mov     [.relocs_rva], eax
-        mov     eax, [ebx+sizeof.STRIPPED_PE_HEADER+SPE_DIRECTORY_BASERELOC*8+4]
-        mov     [.relocs_size], eax
-@@:
-        mov     [.section_header_size], 28
-        lea     edx, [ebx+ecx*8+sizeof.STRIPPED_PE_HEADER+8]
-        mov     ecx, [ebx+STRIPPED_PE_HEADER.SizeOfHeaders]
-.common:
         mov     esi, ebx
+        add     edx, DWORD PTR [ebx+60]
         mov     edi, ebp
+        mov     DWORD PTR [esp+32], edx
+        mov     ecx, DWORD PTR [edx+84]
         shr     ecx, 2
         rep movsd
-        cmp     [.numsections], 0
-        jz      .nosections
-.copy_sections:
-        mov     eax, [edx+8]
+        movzx   eax, WORD PTR [edx+6]
+        mov     DWORD PTR [esp+36], 0
+        mov     DWORD PTR [esp+16], eax
+        jmp     L2
+L3:
+        mov     eax, DWORD PTR [edx+264]
         test    eax, eax
-        je      .no_section_data
+        je      L4
         mov     esi, ebx
         mov     edi, ebp
-        add     esi, [edx+12]
+        add     esi, DWORD PTR [edx+268]
         mov     ecx, eax
-        add     edi, [edx+4]
+        add     edi, DWORD PTR [edx+260]
         add     ecx, 3
         shr     ecx, 2
         rep movsd
-.no_section_data:
-        mov     ecx, [edx]
+L4:
+        mov     ecx, DWORD PTR [edx+256]
         cmp     ecx, eax
-        jbe     .no_section_fill
+        jbe     L6
         sub     ecx, eax
-        add     eax, [edx+4]
+        add     eax, DWORD PTR [edx+260]
         lea     edi, [eax+ebp]
         xor     eax, eax
         rep stosb
-.no_section_fill:
-        add     edx, [.section_header_size]
-        dec     [.numsections]
-        jnz     .copy_sections
-.nosections:
-        cmp     [.relocs_size], 0
-        je      .no_relocations
+L6:
+        inc     DWORD PTR [esp+36]
+        add     edx, 40
+L2:
+        mov     esi, DWORD PTR [esp+16]
+        cmp     DWORD PTR [esp+36], esi
+        jne     L3
+        mov     edi, DWORD PTR [esp+32]
+        cmp     DWORD PTR [edi+164], 0
+        je      L9
+        pushd   [edi+164]
         mov     esi, ebp
         mov     ecx, ebp
-        sub     esi, [.ImageBase]
-        add     ecx, [.relocs_rva]
-.relocs_block:
-        mov     edi, [ecx]
-        add     edi, ebp
-        mov     ebx, [ecx+4]
-        add     ecx, 8
-        sub     [.relocs_size], ebx
-        sub     ebx, 8
+        sub     esi, DWORD PTR [edi+52]
+        add     ecx, DWORD PTR [edi+160]
+        mov     eax, esi
+        shr     eax, 16
+        mov     DWORD PTR [esp+16], eax
+L12:
+        mov     eax, [ecx+4]
+        sub     [esp], eax
+        lea     ebx, [eax-8]
+        xor     edi, edi
         shr     ebx, 1
-        jz      .relocs_next_block
-.one_reloc:
-        movzx   eax, word [ecx]
-        add     ecx, 2
+        jmp     L13
+L14:
+        movzx   eax, WORD PTR [ecx+8+edi*2]
         mov     edx, eax
         shr     eax, 12
         and     edx, 4095
-        cmp     eax, 3
-        jne     @f
-        add     [edx+edi], esi
-@@:
-        dec     ebx
-        jnz     .one_reloc
-.relocs_next_block:
-        cmp     [.relocs_size], 0
-        jg      .relocs_block
-.no_relocations:
-        cmp     [.import_descr], 0
-        je      .no_imports
-        add     [.import_descr], ebp
-        mov     [.bad_import], 0
-.import_block:
-        mov     ecx, [.import_descr]
-        cmp     dword [ecx+4], 0
-        jne     @f
-        cmp     dword [ecx+12], 0
-        je      .done_imports
-@@:
-        mov     edx, dword [ecx]
-        mov     ecx, dword [ecx+16]
+        add     edx, DWORD PTR [ecx]
+        cmp     ax, 2
+        je      L17
+        cmp     ax, 3
+        je      L18
+        dec     ax
+        jne     L15
+        mov     eax, DWORD PTR [esp+16]
+        add     WORD PTR [edx+ebp], ax
+L17:
+        add     WORD PTR [edx+ebp], si
+L18:
+        add     DWORD PTR [edx+ebp], esi
+L15:
+        inc     edi
+L13:
+        cmp     edi, ebx
+        jne     L14
+        add     ecx, DWORD PTR [ecx+4]
+L11:
+        cmp     dword [esp], 0
+        jg      L12
+        pop     eax
+L9:
+        mov     edx, DWORD PTR [esp+32]
+        cmp     DWORD PTR [edx+132], 0
+        je      L20
+        mov     eax, ebp
+        add     eax, DWORD PTR [edx+128]
+        mov     DWORD PTR [esp+40], 0
+        add     eax, 20
+        mov     DWORD PTR [esp+56], eax
+L22:
+        mov     ecx, DWORD PTR [esp+56]
+        cmp     DWORD PTR [ecx-16], 0
+        jne     L23
+        cmp     DWORD PTR [ecx-8], 0
+        je      L25
+L23:
+        mov     edi, DWORD PTR [__exports+32]
+        mov     esi, DWORD PTR [__exports+28]
+        mov     eax, DWORD PTR [esp+56]
+        mov     DWORD PTR [esp+20], edi
+        add     edi, OS_BASE
+        add     esi, OS_BASE
+        mov     DWORD PTR [esp+44], esi
+        mov     ecx, DWORD PTR [eax-4]
+        mov     DWORD PTR [esp+48], edi
+        mov     edx, DWORD PTR [eax-20]
         test    edx, edx
         jnz     @f
         mov     edx, ecx
 @@:
-        mov     [.import_idx], 0
+        mov     DWORD PTR [esp+52], 0
         add     ecx, ebp
         add     edx, ebp
-        mov     [.import_names], edx
-        mov     [.import_targets], ecx
-.import_func:
-        mov     esi, [.import_idx]
-        mov     edi, [.import_names]
-        mov     eax, [edi+esi*4]
+        mov     DWORD PTR [esp+24], edx
+        mov     DWORD PTR [esp+28], ecx
+L26:
+        mov     esi, DWORD PTR [esp+52]
+        mov     edi, DWORD PTR [esp+24]
+        mov     eax, DWORD PTR [edi+esi*4]
         test    eax, eax
-        je      .next_import_block
-        js      .next_import_block
+        je      L27
+        test    eax, eax
+        js      L27
         lea     edi, [ebp+eax]
-        mov     eax, [.import_targets]
-        mov     dword [eax+esi*4], 0
+        mov     eax, DWORD PTR [esp+28]
+        mov     DWORD PTR [eax+esi*4], 0
         lea     esi, [edi+2]
-        movzx   ebx, word [edi]
+        push    eax
         push    32
-        mov     ecx, [__exports+32]
-        mov     eax, [ecx+OS_BASE+ebx*4]
+        movzx   eax, WORD PTR [edi]
+        mov     edx, DWORD PTR [esp+56]
+        mov     eax, DWORD PTR [edx+eax*4]
         add     eax, OS_BASE
         push    eax
         push    esi
         call    strncmp
+        pop     ebx
+        xor     ebx, ebx
         test    eax, eax
-        jz      .import_func_found
-        xor     ebx, ebx
-.import_func_candidate:
+        jne     L32
+        jmp     L30
+L33:
+        push    ecx
         push    32
-        mov     ecx, [__exports+32]
-        mov     eax, [ecx+OS_BASE+ebx*4]
+        mov     ecx, DWORD PTR [esp+28]
+        mov     eax, DWORD PTR [ecx+OS_BASE+ebx*4]
         add     eax, OS_BASE
         push    eax
         push    esi
         call    strncmp
+        pop     edx
         test    eax, eax
-        je      .import_func_found
+        jne     L34
+        mov     esi, DWORD PTR [esp+44]
+        mov     edx, DWORD PTR [esp+52]
+        mov     ecx, DWORD PTR [esp+28]
+        mov     eax, DWORD PTR [esi+ebx*4]
+        add     eax, OS_BASE
+        mov     DWORD PTR [ecx+edx*4], eax
+        jmp     L36
+L34:
         inc     ebx
-        cmp     ebx, [__exports+24]
-        jb      .import_func_candidate
+L32:
+        cmp     ebx, DWORD PTR [__exports+24]
+        jb      L33
+L36:
+        cmp     ebx, DWORD PTR [__exports+24]
+        jne     L37
         mov     esi, msg_unresolved
         call    sys_msg_board_str
 ,30 → 249,34
         mov     esi, msg_CR
         call    sys_msg_board_str
-        mov     [.bad_import], 1
-        jmp     .next_import_func
-.import_func_found:
-        mov     esi, [__exports+28]
-        mov     edx, [.import_idx]
-        mov     ecx, [.import_targets]
-        mov     eax, [esi+OS_BASE+ebx*4]
+        mov     DWORD PTR [esp+40], 1
+        jmp     L37
+L30:
+        movzx   eax, WORD PTR [edi]
+        mov     esi, DWORD PTR [esp+44]
+        mov     edi, DWORD PTR [esp+52]
+        mov     edx, DWORD PTR [esp+28]
+        mov     eax, DWORD PTR [esi+eax*4]
         add     eax, OS_BASE
-        mov     [ecx+edx*4], eax
-.next_import_func:
-        inc     [.import_idx]
-        jmp     .import_func
-.next_import_block:
-        add     [.import_descr], 20
-        jmp     .import_block
-.done_imports:
+        mov     DWORD PTR [edx+edi*4], eax
+L37:
+        inc     DWORD PTR [esp+52]
+        jmp     L26
+L27:
+        add     DWORD PTR [esp+56], 20
+        jmp     L22
+L25:
         xor     eax, eax
-        cmp     [.bad_import], 0
-        jne     @f
-.no_imports:
+        cmp     DWORD PTR [esp+40], 0
+        jne     L40
+L20:
+        mov     ecx, DWORD PTR [esp+32]
         mov     eax, ebp
-        add     eax, [.AddressOfEntryPoint]
-@@:
-        add     esp, .locals_size
+        add     eax, DWORD PTR [ecx+40]
+L40:
+        add     esp, 60
+        pop     ebx
         pop     esi
         pop     edi
-        ret
+        pop     ebp
+        ret     8

 /kernel/trunk/core/dll.inc
 ,8 → 917,6
         test    eax, eax
         jz      .exit
-        lea     edx, [file_name]
-        DEBUGF 1,'K : driver %s is COFF, deprecated\n',edx
         mov     [coff], eax
         movzx   ecx, [eax+COFF_HEADER.nSections]

 /kernel/trunk/data32.inc
 ,7 → 150,7
 szHwMouse       db 'ATI2D',0
 szPS2MDriver    db 'PS2MOUSE',0
 ;szCOM_MDriver   db 'COM_MOUSE',0
-szVidintel      db '/rd/1/drivers/vidintel.sys',0
+szVidintel      db 'vidintel',0
 szUSB           db 'USB',0
 szAtiHW         db '/rd/1/drivers/ati2d.drv',0

 /kernel/trunk/const.inc
 ,28 → 619,6
         NumAuxSymbols   db ?
 ends
-struct  STRIPPED_PE_HEADER
-        Signature           dw ?
-        Characteristics     dw ?
-        AddressOfEntryPoint dd ?
-        ImageBase           dd ?
-        SectionAlignmentLog db ?
-        FileAlignmentLog    db ?
-        MajorOSVersion      db ?
-        MinorOSVersion      db ?
-        SizeOfImage         dd ?
-        SizeOfStackReserve  dd ?
-        SizeOfHeapReserve   dd ?
-        SizeOfHeaders       dd ?
-        Subsystem           db ?
-        NumberOfRvaAndSizes db ?
-        NumberOfSections    dw ?
-ends
-STRIPPED_PE_SIGNATURE = 0x4503 ; 'PE' xor 'S'
-SPE_DIRECTORY_IMPORT    = 0
-SPE_DIRECTORY_EXPORT    = 1
-SPE_DIRECTORY_BASERELOC = 2
 struct  IOCTL
         handle          dd ?
         io_code         dd ?

/data/common/pestrip.asm
File deleted

/data/eng/Makefile.pestrip
File deleted

 /data/eng/Makefile
 ,10 → 135,24
  drivers/usbhid.obj:DRIVERS/USBHID.OBJ:$(KERNEL)/drivers/usbhid/usbhid.asm \
  drivers/usbstor.obj:DRIVERS/USBSTOR.OBJ:$(KERNEL)/drivers/usbstor.asm \
  drivers/vt823x.obj:DRIVERS/VT823X.OBJ:$(KERNEL)/drivers/vt823x.asm \
+ drivers/vidintel.obj:DRIVERS/VIDINTEL.OBJ:$(KERNEL)/drivers/vidintel.asm \
  drivers/3c59x.obj:DRIVERS/3C59X.OBJ:$(REPOSITORY)/drivers/ethernet/3c59x.asm \
  drivers/dec21x4x.obj:DRIVERS/DEC21X4X.OBJ:$(REPOSITORY)/drivers/ethernet/dec21x4x.asm \
+ drivers/forcedeth.sys:DRIVERS/FORCEDETH.SYS:$(REPOSITORY)/drivers/ethernet/forcedeth.asm \
+ drivers/i8254x.sys:DRIVERS/I8254X.SYS:$(REPOSITORY)/drivers/ethernet/i8254x.asm \
+ drivers/i8255x.sys:DRIVERS/I8255X.SYS:$(REPOSITORY)/drivers/ethernet/i8255x.asm \
+ drivers/mtd80x.sys:DRIVERS/MTD80X.SYS:$(REPOSITORY)/drivers/ethernet/mtd80x.asm \
+ drivers/pcnet32.sys:DRIVERS/PCNET32.SYS:$(REPOSITORY)/drivers/ethernet/pcnet32.asm \
+ drivers/r6040.sys:DRIVERS/R6040.SYS:$(REPOSITORY)/drivers/ethernet/R6040.asm \
+ drivers/rhine.sys:DRIVERS/RHINE.SYS:$(REPOSITORY)/drivers/ethernet/rhine.asm \
+ drivers/rtl8029.sys:DRIVERS/RTL8029.SYS:$(REPOSITORY)/drivers/ethernet/RTL8029.asm \
  drivers/rtl8139.obj:DRIVERS/RTL8139.OBJ:$(REPOSITORY)/drivers/ethernet/RTL8139.asm \
  drivers/rtl8169.obj:DRIVERS/RTL8169.OBJ:$(REPOSITORY)/drivers/ethernet/RTL8169.asm \
+ drivers/sis900.sys:DRIVERS/SIS900.SYS:$(REPOSITORY)/drivers/ethernet/sis900.asm \
+ drivers/uhci.sys:DRIVERS/UHCI.SYS:$(REPOSITORY)/drivers/usb/uhci.asm \
+ drivers/ohci.sys:DRIVERS/OHCI.SYS:$(REPOSITORY)/drivers/usb/ohci.asm \
+ drivers/ehci.sys:DRIVERS/EHCI.SYS:$(REPOSITORY)/drivers/usb/ehci.asm \
+ drivers/rdc.sys:DRIVERS/RDC.SYS:$(REPOSITORY)/drivers/video/rdc.asm \
  File|Managers/kfar:File|Managers/KFAR:$(PROGS)/fs/kfar/trunk/kfar.asm \
  File|Managers/kfm:File|Managers/KFM:$(PROGS)/fs/kfm/trunk/kfm.asm \
  File|Managers/opendial:File|Managers/OPENDIAL:$(PROGS)/fs/opendial/opendial.asm \
 ,23 → 212,6
  network/ircc:NETWORK/IRCC:$(PROGS)/network/ircc/ircc.asm \
  network/downloader:NETWORK/DOWNLOADER:$(PROGS)/network/downloader/downloader.asm \
 # end of list
-# Same as above with PE stripping as extra step.
-FASM_PROGRAMS_PESTRIP:=\
- drivers/vidintel.sys:DRIVERS/VIDINTEL.SYS:$(REPOSITORY)/drivers/vidintel.asm \
- drivers/forcedeth.sys:DRIVERS/FORCEDETH.SYS:$(REPOSITORY)/drivers/ethernet/forcedeth.asm \
- drivers/i8254x.sys:DRIVERS/I8254X.SYS:$(REPOSITORY)/drivers/ethernet/i8254x.asm \
- drivers/i8255x.sys:DRIVERS/I8255X.SYS:$(REPOSITORY)/drivers/ethernet/i8255x.asm \
- drivers/mtd80x.sys:DRIVERS/MTD80X.SYS:$(REPOSITORY)/drivers/ethernet/mtd80x.asm \
- drivers/pcnet32.sys:DRIVERS/PCNET32.SYS:$(REPOSITORY)/drivers/ethernet/pcnet32.asm \
- drivers/r6040.sys:DRIVERS/R6040.SYS:$(REPOSITORY)/drivers/ethernet/R6040.asm \
- drivers/rhine.sys:DRIVERS/RHINE.SYS:$(REPOSITORY)/drivers/ethernet/rhine.asm \
- drivers/rtl8029.sys:DRIVERS/RTL8029.SYS:$(REPOSITORY)/drivers/ethernet/RTL8029.asm \
- drivers/sis900.sys:DRIVERS/SIS900.SYS:$(REPOSITORY)/drivers/ethernet/sis900.asm \
- drivers/uhci.sys:DRIVERS/UHCI.SYS:$(REPOSITORY)/drivers/usb/uhci.asm \
- drivers/ohci.sys:DRIVERS/OHCI.SYS:$(REPOSITORY)/drivers/usb/ohci.asm \
- drivers/ehci.sys:DRIVERS/EHCI.SYS:$(REPOSITORY)/drivers/usb/ehci.asm \
- drivers/rdc.sys:DRIVERS/RDC.SYS:$(REPOSITORY)/drivers/video/rdc.asm \
-# end of list
 # The list of all FASM programs with one main FASM file for CD image.
 # Format of an item is exactly the same as in the previous list.
 FASM_PROGRAMS_CD:=\
 ,15 → 448,9
 fsource=$(call respace,$(call sourcepart,$(f)))
 fparam=$(call respace,$(call parampart,$(f)))
-# Add stripped PE files produced by fasm to FASM_NOKPACK_PROGRAMS.
-include Makefile.pestrip
-FASM_NOKPACK_PROGRAMS:=$(FASM_NOKPACK_PROGRAMS) \
- $(foreach f,$(FASM_PROGRAMS_PESTRIP),$(fbinary).full:-:$(fsource))
-$(foreach f,$(FASM_PROGRAMS_PESTRIP),$(eval $(call pestrip_meta_rule,$(fbinary),$(fbinary).full)))
 # Define targets for image file.
 # Join all the lists above.
-targets_full:=$(COPY_FILES) $(FASM_PROGRAMS) $(FASM_PROGRAMS_PESTRIP) $(NASM_PROGRAMS) $(OTHER_FILES) $(CMM_PROGRAMS)
+targets_full:=$(COPY_FILES) $(FASM_PROGRAMS) $(NASM_PROGRAMS) $(OTHER_FILES) $(CMM_PROGRAMS)
 # For each item in the united list call fbinary.
 targets:=$(foreach f,$(targets_full),$(fbinary))

/data/et/Makefile.pestrip
File deleted

 /data/et/Makefile
 ,10 → 135,24
  drivers/usbhid.obj:DRIVERS/USBHID.OBJ:$(KERNEL)/drivers/usbhid/usbhid.asm \
  drivers/usbstor.obj:DRIVERS/USBSTOR.OBJ:$(KERNEL)/drivers/usbstor.asm \
  drivers/vt823x.obj:DRIVERS/VT823X.OBJ:$(KERNEL)/drivers/vt823x.asm \
+ drivers/vidintel.obj:DRIVERS/VIDINTEL.OBJ:$(KERNEL)/drivers/vidintel.asm \
  drivers/3c59x.obj:DRIVERS/3C59X.OBJ:$(REPOSITORY)/drivers/ethernet/3c59x.asm \
  drivers/dec21x4x.obj:DRIVERS/DEC21X4X.OBJ:$(REPOSITORY)/drivers/ethernet/dec21x4x.asm \
+ drivers/forcedeth.sys:DRIVERS/FORCEDETH.SYS:$(REPOSITORY)/drivers/ethernet/forcedeth.asm \
+ drivers/i8254x.sys:DRIVERS/I8254X.SYS:$(REPOSITORY)/drivers/ethernet/i8254x.asm \
+ drivers/i8255x.sys:DRIVERS/I8255X.SYS:$(REPOSITORY)/drivers/ethernet/i8255x.asm \
+ drivers/mtd80x.sys:DRIVERS/MTD80X.SYS:$(REPOSITORY)/drivers/ethernet/mtd80x.asm \
+ drivers/pcnet32.sys:DRIVERS/PCNET32.SYS:$(REPOSITORY)/drivers/ethernet/pcnet32.asm \
+ drivers/r6040.sys:DRIVERS/R6040.SYS:$(REPOSITORY)/drivers/ethernet/R6040.asm \
+ drivers/rhine.sys:DRIVERS/RHINE.SYS:$(REPOSITORY)/drivers/ethernet/rhine.asm \
+ drivers/rtl8029.sys:DRIVERS/RTL8029.SYS:$(REPOSITORY)/drivers/ethernet/RTL8029.asm \
  drivers/rtl8139.obj:DRIVERS/RTL8139.OBJ:$(REPOSITORY)/drivers/ethernet/RTL8139.asm \
  drivers/rtl8169.obj:DRIVERS/RTL8169.OBJ:$(REPOSITORY)/drivers/ethernet/RTL8169.asm \
+ drivers/sis900.sys:DRIVERS/SIS900.SYS:$(REPOSITORY)/drivers/ethernet/sis900.asm \
+ drivers/uhci.sys:DRIVERS/UHCI.SYS:$(REPOSITORY)/drivers/usb/uhci.asm \
+ drivers/ohci.sys:DRIVERS/OHCI.SYS:$(REPOSITORY)/drivers/usb/ohci.asm \
+ drivers/ehci.sys:DRIVERS/EHCI.SYS:$(REPOSITORY)/drivers/usb/ehci.asm \
+ drivers/rdc.sys:DRIVERS/RDC.SYS:$(REPOSITORY)/drivers/video/rdc.asm \
  File|Managers/kfar:File|Managers/KFAR:$(PROGS)/fs/kfar/trunk/kfar.asm \
  File|Managers/kfm:File|Managers/KFM:$(PROGS)/fs/kfm/trunk/kfm.asm \
  File|Managers/opendial:File|Managers/OPENDIAL:$(PROGS)/fs/opendial/opendial.asm \
 ,23 → 212,6
  network/ircc:NETWORK/IRCC:$(PROGS)/network/ircc/ircc.asm \
  network/downloader:NETWORK/DOWNLOADER:$(PROGS)/network/downloader/downloader.asm \
 # end of list
-# Same as above with PE stripping as extra step.
-FASM_PROGRAMS_PESTRIP:=\
- drivers/vidintel.sys:DRIVERS/VIDINTEL.SYS:$(REPOSITORY)/drivers/vidintel.asm \
- drivers/forcedeth.sys:DRIVERS/FORCEDETH.SYS:$(REPOSITORY)/drivers/ethernet/forcedeth.asm \
- drivers/i8254x.sys:DRIVERS/I8254X.SYS:$(REPOSITORY)/drivers/ethernet/i8254x.asm \
- drivers/i8255x.sys:DRIVERS/I8255X.SYS:$(REPOSITORY)/drivers/ethernet/i8255x.asm \
- drivers/mtd80x.sys:DRIVERS/MTD80X.SYS:$(REPOSITORY)/drivers/ethernet/mtd80x.asm \
- drivers/pcnet32.sys:DRIVERS/PCNET32.SYS:$(REPOSITORY)/drivers/ethernet/pcnet32.asm \
- drivers/r6040.sys:DRIVERS/R6040.SYS:$(REPOSITORY)/drivers/ethernet/R6040.asm \
- drivers/rhine.sys:DRIVERS/RHINE.SYS:$(REPOSITORY)/drivers/ethernet/rhine.asm \
- drivers/rtl8029.sys:DRIVERS/RTL8029.SYS:$(REPOSITORY)/drivers/ethernet/RTL8029.asm \
- drivers/sis900.sys:DRIVERS/SIS900.SYS:$(REPOSITORY)/drivers/ethernet/sis900.asm \
- drivers/uhci.sys:DRIVERS/UHCI.SYS:$(REPOSITORY)/drivers/usb/uhci.asm \
- drivers/ohci.sys:DRIVERS/OHCI.SYS:$(REPOSITORY)/drivers/usb/ohci.asm \
- drivers/ehci.sys:DRIVERS/EHCI.SYS:$(REPOSITORY)/drivers/usb/ehci.asm \
- drivers/rdc.sys:DRIVERS/RDC.SYS:$(REPOSITORY)/drivers/video/rdc.asm \
-# end of list
 # The list of all FASM programs with one main FASM file for CD image.
 # Format of an item is exactly the same as in the previous list.
 FASM_PROGRAMS_CD:=\
 ,15 → 446,9
 fsource=$(call respace,$(call sourcepart,$(f)))
 fparam=$(call respace,$(call parampart,$(f)))
-# Add stripped PE files produced by fasm to FASM_NOKPACK_PROGRAMS.
-include Makefile.pestrip
-FASM_NOKPACK_PROGRAMS:=$(FASM_NOKPACK_PROGRAMS) \
- $(foreach f,$(FASM_PROGRAMS_PESTRIP),$(fbinary).full:-:$(fsource))
-$(foreach f,$(FASM_PROGRAMS_PESTRIP),$(eval $(call pestrip_meta_rule,$(fbinary),$(fbinary).full)))
 # Define targets for image file.
 # Join all the lists above.
-targets_full:=$(COPY_FILES) $(FASM_PROGRAMS) $(FASM_PROGRAMS_PESTRIP) $(NASM_PROGRAMS) $(OTHER_FILES) $(CMM_PROGRAMS)
+targets_full:=$(COPY_FILES) $(FASM_PROGRAMS) $(NASM_PROGRAMS) $(OTHER_FILES) $(CMM_PROGRAMS)
 # For each item in the united list call fbinary.
 targets:=$(foreach f,$(targets_full),$(fbinary))

/data/it/Makefile.pestrip
File deleted

 /data/it/Makefile
 ,10 → 135,24
  drivers/usbhid.obj:DRIVERS/USBHID.OBJ:$(KERNEL)/drivers/usbhid/usbhid.asm \
  drivers/usbstor.obj:DRIVERS/USBSTOR.OBJ:$(KERNEL)/drivers/usbstor.asm \
  drivers/vt823x.obj:DRIVERS/VT823X.OBJ:$(KERNEL)/drivers/vt823x.asm \
+ drivers/vidintel.obj:DRIVERS/VIDINTEL.OBJ:$(KERNEL)/drivers/vidintel.asm \
  drivers/3c59x.obj:DRIVERS/3C59X.OBJ:$(REPOSITORY)/drivers/ethernet/3c59x.asm \
  drivers/dec21x4x.obj:DRIVERS/DEC21X4X.OBJ:$(REPOSITORY)/drivers/ethernet/dec21x4x.asm \
+ drivers/forcedeth.sys:DRIVERS/FORCEDETH.SYS:$(REPOSITORY)/drivers/ethernet/forcedeth.asm \
+ drivers/i8254x.sys:DRIVERS/I8254X.SYS:$(REPOSITORY)/drivers/ethernet/i8254x.asm \
+ drivers/i8255x.sys:DRIVERS/I8255X.SYS:$(REPOSITORY)/drivers/ethernet/i8255x.asm \
+ drivers/mtd80x.sys:DRIVERS/MTD80X.SYS:$(REPOSITORY)/drivers/ethernet/mtd80x.asm \
+ drivers/pcnet32.sys:DRIVERS/PCNET32.SYS:$(REPOSITORY)/drivers/ethernet/pcnet32.asm \
+ drivers/r6040.sys:DRIVERS/R6040.SYS:$(REPOSITORY)/drivers/ethernet/R6040.asm \
+ drivers/rhine.sys:DRIVERS/RHINE.SYS:$(REPOSITORY)/drivers/ethernet/rhine.asm \
+ drivers/rtl8029.sys:DRIVERS/RTL8029.SYS:$(REPOSITORY)/drivers/ethernet/RTL8029.asm \
  drivers/rtl8139.obj:DRIVERS/RTL8139.OBJ:$(REPOSITORY)/drivers/ethernet/RTL8139.asm \
  drivers/rtl8169.obj:DRIVERS/RTL8169.OBJ:$(REPOSITORY)/drivers/ethernet/RTL8169.asm \
+ drivers/sis900.sys:DRIVERS/SIS900.SYS:$(REPOSITORY)/drivers/ethernet/sis900.asm \
+ drivers/uhci.sys:DRIVERS/UHCI.SYS:$(REPOSITORY)/drivers/usb/uhci.asm \
+ drivers/ohci.sys:DRIVERS/OHCI.SYS:$(REPOSITORY)/drivers/usb/ohci.asm \
+ drivers/ehci.sys:DRIVERS/EHCI.SYS:$(REPOSITORY)/drivers/usb/ehci.asm \
+ drivers/rdc.sys:DRIVERS/RDC.SYS:$(REPOSITORY)/drivers/video/rdc.asm \
  File|Managers/kfar:File|Managers/KFAR:$(PROGS)/fs/kfar/trunk/kfar.asm \
  File|Managers/kfm:File|Managers/KFM:$(PROGS)/fs/kfm/trunk/kfm.asm \
  File|Managers/opendial:File|Managers/OPENDIAL:$(PROGS)/fs/opendial/opendial.asm \
 ,23 → 212,6
  network/ircc:NETWORK/IRCC:$(PROGS)/network/ircc/ircc.asm \
  network/downloader:NETWORK/DOWNLOADER:$(PROGS)/network/downloader/downloader.asm \
 # end of list
-# Same as above with PE stripping as extra step.
-FASM_PROGRAMS_PESTRIP:=\
- drivers/vidintel.sys:DRIVERS/VIDINTEL.SYS:$(REPOSITORY)/drivers/vidintel.asm \
- drivers/forcedeth.sys:DRIVERS/FORCEDETH.SYS:$(REPOSITORY)/drivers/ethernet/forcedeth.asm \
- drivers/i8254x.sys:DRIVERS/I8254X.SYS:$(REPOSITORY)/drivers/ethernet/i8254x.asm \
- drivers/i8255x.sys:DRIVERS/I8255X.SYS:$(REPOSITORY)/drivers/ethernet/i8255x.asm \
- drivers/mtd80x.sys:DRIVERS/MTD80X.SYS:$(REPOSITORY)/drivers/ethernet/mtd80x.asm \
- drivers/pcnet32.sys:DRIVERS/PCNET32.SYS:$(REPOSITORY)/drivers/ethernet/pcnet32.asm \
- drivers/r6040.sys:DRIVERS/R6040.SYS:$(REPOSITORY)/drivers/ethernet/R6040.asm \
- drivers/rhine.sys:DRIVERS/RHINE.SYS:$(REPOSITORY)/drivers/ethernet/rhine.asm \
- drivers/rtl8029.sys:DRIVERS/RTL8029.SYS:$(REPOSITORY)/drivers/ethernet/RTL8029.asm \
- drivers/sis900.sys:DRIVERS/SIS900.SYS:$(REPOSITORY)/drivers/ethernet/sis900.asm \
- drivers/uhci.sys:DRIVERS/UHCI.SYS:$(REPOSITORY)/drivers/usb/uhci.asm \
- drivers/ohci.sys:DRIVERS/OHCI.SYS:$(REPOSITORY)/drivers/usb/ohci.asm \
- drivers/ehci.sys:DRIVERS/EHCI.SYS:$(REPOSITORY)/drivers/usb/ehci.asm \
- drivers/rdc.sys:DRIVERS/RDC.SYS:$(REPOSITORY)/drivers/video/rdc.asm \
-# end of list
 # The list of all FASM programs with one main FASM file for CD image.
 # Format of an item is exactly the same as in the previous list.
 FASM_PROGRAMS_CD:=\
 ,16 → 439,9
 fsource=$(call respace,$(call sourcepart,$(f)))
 fparam=$(call respace,$(call parampart,$(f)))
-# Add stripped PE files produced by fasm to FASM_NOKPACK_PROGRAMS.
-include Makefile.pestrip
-FASM_NOKPACK_PROGRAMS:=$(FASM_NOKPACK_PROGRAMS) \
- $(foreach f,$(FASM_PROGRAMS_PESTRIP),$(fbinary).full:-:$(fsource))
-$(foreach f,$(FASM_PROGRAMS_PESTRIP),$(eval $(call pestrip_meta_rule,$(fbinary),$(fbinary).full)))
 # Define targets for image file.
 # Join all the lists above.
-targets_full:=$(COPY_FILES) $(FASM_PROGRAMS) $(FASM_PROGRAMS_PESTRIP) $(NASM_PROGRAMS) $(OTHER_FILES) $(CMM_PROGRAMS)
+targets_full:=$(COPY_FILES) $(FASM_PROGRAMS) $(NASM_PROGRAMS) $(OTHER_FILES) $(CMM_PROGRAMS)
 # For each item in the united list call fbinary.
 targets:=$(foreach f,$(targets_full),$(fbinary))

/data/rus/Makefile.pestrip
File deleted

 /data/rus/Makefile
 ,10 → 136,24
  drivers/usbhid.obj:DRIVERS/USBHID.OBJ:$(KERNEL)/drivers/usbhid/usbhid.asm \
  drivers/usbstor.obj:DRIVERS/USBSTOR.OBJ:$(KERNEL)/drivers/usbstor.asm \
  drivers/vt823x.obj:DRIVERS/VT823X.OBJ:$(KERNEL)/drivers/vt823x.asm \
+ drivers/vidintel.obj:DRIVERS/VIDINTEL.OBJ:$(KERNEL)/drivers/vidintel.asm \
  drivers/3c59x.obj:DRIVERS/3C59X.OBJ:$(REPOSITORY)/drivers/ethernet/3c59x.asm \
  drivers/dec21x4x.obj:DRIVERS/DEC21X4X.OBJ:$(REPOSITORY)/drivers/ethernet/dec21x4x.asm \
+ drivers/forcedeth.sys:DRIVERS/FORCEDETH.SYS:$(REPOSITORY)/drivers/ethernet/forcedeth.asm \
+ drivers/i8254x.sys:DRIVERS/I8254X.SYS:$(REPOSITORY)/drivers/ethernet/i8254x.asm \
+ drivers/i8255x.sys:DRIVERS/I8255X.SYS:$(REPOSITORY)/drivers/ethernet/i8255x.asm \
+ drivers/mtd80x.sys:DRIVERS/MTD80X.SYS:$(REPOSITORY)/drivers/ethernet/mtd80x.asm \
+ drivers/pcnet32.sys:DRIVERS/PCNET32.SYS:$(REPOSITORY)/drivers/ethernet/pcnet32.asm \
+ drivers/r6040.sys:DRIVERS/R6040.SYS:$(REPOSITORY)/drivers/ethernet/R6040.asm \
+ drivers/rhine.sys:DRIVERS/RHINE.SYS:$(REPOSITORY)/drivers/ethernet/rhine.asm \
+ drivers/rtl8029.sys:DRIVERS/RTL8029.SYS:$(REPOSITORY)/drivers/ethernet/RTL8029.asm \
  drivers/rtl8139.obj:DRIVERS/RTL8139.OBJ:$(REPOSITORY)/drivers/ethernet/RTL8139.asm \
  drivers/rtl8169.obj:DRIVERS/RTL8169.OBJ:$(REPOSITORY)/drivers/ethernet/RTL8169.asm \
+ drivers/sis900.sys:DRIVERS/SIS900.SYS:$(REPOSITORY)/drivers/ethernet/sis900.asm \
+ drivers/uhci.sys:DRIVERS/UHCI.SYS:$(REPOSITORY)/drivers/usb/uhci.asm \
+ drivers/ohci.sys:DRIVERS/OHCI.SYS:$(REPOSITORY)/drivers/usb/ohci.asm \
+ drivers/ehci.sys:DRIVERS/EHCI.SYS:$(REPOSITORY)/drivers/usb/ehci.asm \
+ drivers/rdc.sys:DRIVERS/RDC.SYS:$(REPOSITORY)/drivers/video/rdc.asm \
  File|Managers/kfar:File|Managers/KFAR:$(PROGS)/fs/kfar/trunk/kfar.asm \
  File|Managers/kfm:File|Managers/KFM:$(PROGS)/fs/kfm/trunk/kfm.asm \
  File|Managers/opendial:File|Managers/OPENDIAL:$(PROGS)/fs/opendial/opendial.asm \
 ,23 → 212,6
  network/ircc:NETWORK/IRCC:$(PROGS)/network/ircc/ircc.asm \
  network/downloader:NETWORK/DOWNLOADER:$(PROGS)/network/downloader/downloader.asm \
 # end of list
-# Same as above with PE stripping as extra step.
-FASM_PROGRAMS_PESTRIP:=\
- drivers/vidintel.sys:DRIVERS/VIDINTEL.SYS:$(REPOSITORY)/drivers/video/vidintel.asm \
- drivers/forcedeth.sys:DRIVERS/FORCEDETH.SYS:$(REPOSITORY)/drivers/ethernet/forcedeth.asm \
- drivers/i8254x.sys:DRIVERS/I8254X.SYS:$(REPOSITORY)/drivers/ethernet/i8254x.asm \
- drivers/i8255x.sys:DRIVERS/I8255X.SYS:$(REPOSITORY)/drivers/ethernet/i8255x.asm \
- drivers/mtd80x.sys:DRIVERS/MTD80X.SYS:$(REPOSITORY)/drivers/ethernet/mtd80x.asm \
- drivers/pcnet32.sys:DRIVERS/PCNET32.SYS:$(REPOSITORY)/drivers/ethernet/pcnet32.asm \
- drivers/r6040.sys:DRIVERS/R6040.SYS:$(REPOSITORY)/drivers/ethernet/R6040.asm \
- drivers/rhine.sys:DRIVERS/RHINE.SYS:$(REPOSITORY)/drivers/ethernet/rhine.asm \
- drivers/rtl8029.sys:DRIVERS/RTL8029.SYS:$(REPOSITORY)/drivers/ethernet/RTL8029.asm \
- drivers/sis900.sys:DRIVERS/SIS900.SYS:$(REPOSITORY)/drivers/ethernet/sis900.asm \
- drivers/uhci.sys:DRIVERS/UHCI.SYS:$(REPOSITORY)/drivers/usb/uhci.asm \
- drivers/ohci.sys:DRIVERS/OHCI.SYS:$(REPOSITORY)/drivers/usb/ohci.asm \
- drivers/ehci.sys:DRIVERS/EHCI.SYS:$(REPOSITORY)/drivers/usb/ehci.asm \
- drivers/rdc.sys:DRIVERS/RDC.SYS:$(REPOSITORY)/drivers/video/rdc.asm \
-# end of list
 # The list of all FASM programs with one main FASM file for CD image.
 # Format of an item is exactly the same as in the previous list.
 FASM_PROGRAMS_CD:=\
 ,15 → 467,9
 fsource=$(call respace,$(call sourcepart,$(f)))
 fparam=$(call respace,$(call parampart,$(f)))
-# Add stripped PE files produced by fasm to FASM_NOKPACK_PROGRAMS.
-include Makefile.pestrip
-FASM_NOKPACK_PROGRAMS:=$(FASM_NOKPACK_PROGRAMS) \
- $(foreach f,$(FASM_PROGRAMS_PESTRIP),$(fbinary).full:-:$(fsource))
-$(foreach f,$(FASM_PROGRAMS_PESTRIP),$(eval $(call pestrip_meta_rule,$(fbinary),$(fbinary).full)))
 # Define targets for image file.
 # Join all the lists above.
-targets_full:=$(COPY_FILES) $(FASM_PROGRAMS) $(FASM_PROGRAMS_PESTRIP) $(NASM_PROGRAMS) $(OTHER_FILES) $(CMM_PROGRAMS)
+targets_full:=$(COPY_FILES) $(FASM_PROGRAMS) $(NASM_PROGRAMS) $(OTHER_FILES) $(CMM_PROGRAMS)
 # For each item in the united list call fbinary.
 targets:=$(foreach f,$(targets_full),$(fbinary))

/data/sp/Makefile.pestrip
File deleted

 /data/sp/Makefile
 ,10 → 135,24
  drivers/usbhid.obj:DRIVERS/USBHID.OBJ:$(KERNEL)/drivers/usbhid/usbhid.asm \
  drivers/usbstor.obj:DRIVERS/USBSTOR.OBJ:$(KERNEL)/drivers/usbstor.asm \
  drivers/vt823x.obj:DRIVERS/VT823X.OBJ:$(KERNEL)/drivers/vt823x.asm \
+ drivers/vidintel.obj:DRIVERS/VIDINTEL.OBJ:$(KERNEL)/drivers/vidintel.asm \
  drivers/3c59x.obj:DRIVERS/3C59X.OBJ:$(REPOSITORY)/drivers/ethernet/3c59x.asm \
  drivers/dec21x4x.obj:DRIVERS/DEC21X4X.OBJ:$(REPOSITORY)/drivers/ethernet/dec21x4x.asm \
+ drivers/forcedeth.sys:DRIVERS/FORCEDETH.SYS:$(REPOSITORY)/drivers/ethernet/forcedeth.asm \
+ drivers/i8254x.sys:DRIVERS/I8254X.SYS:$(REPOSITORY)/drivers/ethernet/i8254x.asm \
+ drivers/i8255x.sys:DRIVERS/I8255X.SYS:$(REPOSITORY)/drivers/ethernet/i8255x.asm \
+ drivers/mtd80x.sys:DRIVERS/MTD80X.SYS:$(REPOSITORY)/drivers/ethernet/mtd80x.asm \
+ drivers/pcnet32.sys:DRIVERS/PCNET32.SYS:$(REPOSITORY)/drivers/ethernet/pcnet32.asm \
+ drivers/r6040.sys:DRIVERS/R6040.SYS:$(REPOSITORY)/drivers/ethernet/R6040.asm \
+ drivers/rhine.sys:DRIVERS/RHINE.SYS:$(REPOSITORY)/drivers/ethernet/rhine.asm \
+ drivers/rtl8029.sys:DRIVERS/RTL8029.SYS:$(REPOSITORY)/drivers/ethernet/RTL8029.asm \
  drivers/rtl8139.obj:DRIVERS/RTL8139.OBJ:$(REPOSITORY)/drivers/ethernet/RTL8139.asm \
  drivers/rtl8169.obj:DRIVERS/RTL8169.OBJ:$(REPOSITORY)/drivers/ethernet/RTL8169.asm \
+ drivers/sis900.sys:DRIVERS/SIS900.SYS:$(REPOSITORY)/drivers/ethernet/sis900.asm \
+ drivers/uhci.sys:DRIVERS/UHCI.SYS:$(REPOSITORY)/drivers/usb/uhci.asm \
+ drivers/ohci.sys:DRIVERS/OHCI.SYS:$(REPOSITORY)/drivers/usb/ohci.asm \
+ drivers/ehci.sys:DRIVERS/EHCI.SYS:$(REPOSITORY)/drivers/usb/ehci.asm \
+ drivers/rdc.sys:DRIVERS/RDC.SYS:$(REPOSITORY)/drivers/video/rdc.asm \
  File|Managers/kfar:File|Managers/KFAR:$(PROGS)/fs/kfar/trunk/kfar.asm \
  File|Managers/kfm:File|Managers/KFM:$(PROGS)/fs/kfm/trunk/kfm.asm \
  File|Managers/opendial:File|Managers/OPENDIAL:$(PROGS)/fs/opendial/opendial.asm \
 ,23 → 212,6
  network/ircc:NETWORK/IRCC:$(PROGS)/network/ircc/ircc.asm \
  network/downloader:NETWORK/DOWNLOADER:$(PROGS)/network/downloader/downloader.asm \
 # end of list
-# Same as above with PE stripping as extra step.
-FASM_PROGRAMS_PESTRIP:=\
- drivers/vidintel.sys:DRIVERS/VIDINTEL.SYS:$(REPOSITORY)/drivers/vidintel.asm \
- drivers/forcedeth.sys:DRIVERS/FORCEDETH.SYS:$(REPOSITORY)/drivers/ethernet/forcedeth.asm \
- drivers/i8254x.sys:DRIVERS/I8254X.SYS:$(REPOSITORY)/drivers/ethernet/i8254x.asm \
- drivers/i8255x.sys:DRIVERS/I8255X.SYS:$(REPOSITORY)/drivers/ethernet/i8255x.asm \
- drivers/mtd80x.sys:DRIVERS/MTD80X.SYS:$(REPOSITORY)/drivers/ethernet/mtd80x.asm \
- drivers/pcnet32.sys:DRIVERS/PCNET32.SYS:$(REPOSITORY)/drivers/ethernet/pcnet32.asm \
- drivers/r6040.sys:DRIVERS/R6040.SYS:$(REPOSITORY)/drivers/ethernet/R6040.asm \
- drivers/rhine.sys:DRIVERS/RHINE.SYS:$(REPOSITORY)/drivers/ethernet/rhine.asm \
- drivers/rtl8029.sys:DRIVERS/RTL8029.SYS:$(REPOSITORY)/drivers/ethernet/RTL8029.asm \
- drivers/sis900.sys:DRIVERS/SIS900.SYS:$(REPOSITORY)/drivers/ethernet/sis900.asm \
- drivers/uhci.sys:DRIVERS/UHCI.SYS:$(REPOSITORY)/drivers/usb/uhci.asm \
- drivers/ohci.sys:DRIVERS/OHCI.SYS:$(REPOSITORY)/drivers/usb/ohci.asm \
- drivers/ehci.sys:DRIVERS/EHCI.SYS:$(REPOSITORY)/drivers/usb/ehci.asm \
- drivers/rdc.sys:DRIVERS/RDC.SYS:$(REPOSITORY)/drivers/video/rdc.asm \
-# end of list
 # The list of all FASM programs with one main FASM file for CD image.
 # Format of an item is exactly the same as in the previous list.
 FASM_PROGRAMS_CD:=\
 ,15 → 445,9
 fsource=$(call respace,$(call sourcepart,$(f)))
 fparam=$(call respace,$(call parampart,$(f)))
-# Add stripped PE files produced by fasm to FASM_NOKPACK_PROGRAMS.
-include Makefile.pestrip
-FASM_NOKPACK_PROGRAMS:=$(FASM_NOKPACK_PROGRAMS) \
- $(foreach f,$(FASM_PROGRAMS_PESTRIP),$(fbinary).full:-:$(fsource))
-$(foreach f,$(FASM_PROGRAMS_PESTRIP),$(eval $(call pestrip_meta_rule,$(fbinary),$(fbinary).full)))
 # Define targets for image file.
 # Join all the lists above.
-targets_full:=$(COPY_FILES) $(FASM_PROGRAMS) $(FASM_PROGRAMS_PESTRIP) $(NASM_PROGRAMS) $(OTHER_FILES) $(CMM_PROGRAMS)
+targets_full:=$(COPY_FILES) $(FASM_PROGRAMS) $(NASM_PROGRAMS) $(OTHER_FILES) $(CMM_PROGRAMS)
 # For each item in the united list call fbinary.
 targets:=$(foreach f,$(targets_full),$(fbinary))

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5039 → Rev 5038