From 909f14782c738967bb79435ab9380c15dca7d12b Mon Sep 17 00:00:00 2001 From: CleverMouse Date: Mon, 27 Dec 2010 12:29:39 +0000 Subject: [PATCH] fix compilation in linux git-svn-id: svn://kolibrios.org@1728 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/demos/3DS/VIEW3DS.ASM | 28 +++++++++---------- programs/demos/3DS/data.inc | 2 +- programs/demos/eyes/trunk/eyes.asm | 2 +- programs/demos/firework/trunk/firework.asm | 2 +- programs/demos/unvwater/trunk/unvwater.asm | 2 +- .../libraries/libs-dev/libimg/pcx/pcx.asm | 2 +- programs/games/freecell/freecell.ASM | 24 ++++++++-------- programs/games/tetris/trunk/tetris.asm | 6 ++-- programs/network/zeroconf/trunk/zeroconf.asm | 2 +- programs/system/disptest/trunk/disptest.ASM | 2 +- programs/system/pcidev/trunk/PCIDEV.ASM | 2 +- programs/system/zkey/trunk/ZKEY.ASM | 2 +- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/programs/demos/3DS/VIEW3DS.ASM b/programs/demos/3DS/VIEW3DS.ASM index 247a781140..7a4751c306 100644 --- a/programs/demos/3DS/VIEW3DS.ASM +++ b/programs/demos/3DS/VIEW3DS.ASM @@ -481,20 +481,20 @@ still: ;-------------------------------------------------------------------------------- ;-------------------------PROCEDURES--------------------------------------------- ;-------------------------------------------------------------------------------- -include "tex3.inc" -include "flat_cat.inc" -include "tex_cat.inc" -include "bump_cat.inc" -include "3dmath.inc" -include "grd3.inc" -include "flat3.inc" -include "bump3.inc" -include "b_procs.inc" -include "a_procs.inc" -include "grd_cat.inc" -include "bump_tex.inc" -include "grd_tex.inc" -include "two_tex.inc" +include "TEX3.INC" +include "FLAT_CAT.INC" +include "TEX_CAT.INC" +include "BUMP_CAT.INC" +include "3DMATH.INC" +include "GRD3.INC" +include "FLAT3.INC" +include "BUMP3.INC" +include "B_PROCS.INC" +include "A_PROCS.INC" +include "GRD_CAT.INC" +include "BUMP_TEX.INC" +include "GRD_TEX.INC" +include "TWO_TEX.INC" alloc_buffer_mem: movzx ecx,[size_x] diff --git a/programs/demos/3DS/data.inc b/programs/demos/3DS/data.inc index 0d1263e4d1..e6352b799e 100644 --- a/programs/demos/3DS/data.inc +++ b/programs/demos/3DS/data.inc @@ -390,7 +390,7 @@ align 8 rand_seed dw ? align 8 buffer dq ? - err dd ? + err_ dd ? drr dd ? xx dd ? yy dd ? diff --git a/programs/demos/eyes/trunk/eyes.asm b/programs/demos/eyes/trunk/eyes.asm index 2ff58ad372..61c01d8db1 100644 --- a/programs/demos/eyes/trunk/eyes.asm +++ b/programs/demos/eyes/trunk/eyes.asm @@ -385,4 +385,4 @@ sign1 db 0 sign2 db 0 EYES_END: ; end of code -file "EYES.RAW" +file "eyes.raw" diff --git a/programs/demos/firework/trunk/firework.asm b/programs/demos/firework/trunk/firework.asm index e278ca5e07..458cf348e2 100644 --- a/programs/demos/firework/trunk/firework.asm +++ b/programs/demos/firework/trunk/firework.asm @@ -19,7 +19,7 @@ use32 dd 0x100000 ; required amount of memory dd 0x00000000 ; reserved=no extended header -include "aspAPI.inc" +include "aspapi.inc" SCREEN_WIDTH equ 320 SCREEN_HEIGHT equ 200 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/programs/demos/unvwater/trunk/unvwater.asm b/programs/demos/unvwater/trunk/unvwater.asm index b20737f363..a3e0ba628b 100644 --- a/programs/demos/unvwater/trunk/unvwater.asm +++ b/programs/demos/unvwater/trunk/unvwater.asm @@ -15,7 +15,7 @@ use32 dd 0x100000 ; required amount of memory dd 0x00000000 ; reserved=no extended header -include "aspAPI.inc" +include "aspapi.inc" SCREEN_WIDTH equ 100h SCREEN_HEIGHT equ 100h diff --git a/programs/develop/libraries/libs-dev/libimg/pcx/pcx.asm b/programs/develop/libraries/libs-dev/libimg/pcx/pcx.asm index 14b714af10..0230665981 100644 --- a/programs/develop/libraries/libs-dev/libimg/pcx/pcx.asm +++ b/programs/develop/libraries/libs-dev/libimg/pcx/pcx.asm @@ -18,7 +18,7 @@ ;;================================================================================================;; include 'pcx.inc' -include '../../../../system/board/trunk/debug.inc' +;include '../../../../system/board/trunk/debug.inc' ;;================================================================================================;; proc img.is.pcx _data, _length ;//////////////////////////////////////////////////////////////////;; diff --git a/programs/games/freecell/freecell.ASM b/programs/games/freecell/freecell.ASM index a6d9f48915..6dabf797b5 100644 --- a/programs/games/freecell/freecell.ASM +++ b/programs/games/freecell/freecell.ASM @@ -2004,21 +2004,21 @@ end if negativedraw db 0 ; for procedure draw_card - spade file 'SPADE.BMP': 54 - spade_updown file 'SPADEUD.BMP': 54 - spade_small file 'SPADESML.BMP': 54 + spade file 'Spade.bmp': 54 + spade_updown file 'SpadeUD.bmp': 54 + spade_small file 'SpadeSml.bmp': 54 - club file 'CLUB.BMP': 54 - club_updown file 'CLUBUD.BMP': 54 - club_small file 'CLUBSML.BMP': 54 + club file 'Club.bmp': 54 + club_updown file 'ClubUD.bmp': 54 + club_small file 'ClubSml.bmp': 54 - diamond file 'DIAM.BMP': 54 - diamond_updown file 'DIAMUD.BMP': 54 - diamond_small file 'DIAMSML.BMP': 54 + diamond file 'Diam.bmp': 54 + diamond_updown file 'DiamUD.bmp': 54 + diamond_small file 'DiamSml.bmp': 54 - heart file 'HEART.BMP': 54 - heart_updown file 'HEARTUD.BMP': 54 - heart_small file 'HEARTSML.BMP': 54 + heart file 'Heart.bmp': 54 + heart_updown file 'HeartUD.bmp': 54 + heart_small file 'HeartSml.bmp': 54 scNotSelected = 0 diff --git a/programs/games/tetris/trunk/tetris.asm b/programs/games/tetris/trunk/tetris.asm index 6e0bca9a86..b12e57902c 100644 --- a/programs/games/tetris/trunk/tetris.asm +++ b/programs/games/tetris/trunk/tetris.asm @@ -265,7 +265,7 @@ draw_window: mov ecx,25*65536+ (LEN_Y-BORDER_TOP-BORDER_BOTTOM)*ADOBE_SIZE+Y_LOCATION+30 mov edx,[sc.work] ; color of work area RRGGBB or edx,0x13000000 - mov edi,header ; WINDOW LABEL + mov edi,title ; WINDOW LABEL int 0x40 @@ -833,14 +833,14 @@ block_table: if lang eq ru - header db ' 1.61 - ',0 + title db ' 1.61 - ',0 labe db '',0 text db '窨:',0 game_finished: db '',0 else - header db 'TETRIS 1.61 - ARROWS & SPACE',0 + title db 'TETRIS 1.61 - ARROWS & SPACE',0 labe db 'PAUSE',0 text db 'Score:',0 game_finished: db 'NEW GAME',0 diff --git a/programs/network/zeroconf/trunk/zeroconf.asm b/programs/network/zeroconf/trunk/zeroconf.asm index 8502abbae3..c138e51507 100644 --- a/programs/network/zeroconf/trunk/zeroconf.asm +++ b/programs/network/zeroconf/trunk/zeroconf.asm @@ -43,7 +43,7 @@ DEFEND_INTERVAL equ 10 ; seconds (min. wait between defensive ARPs) include '../../../proc32.inc' include '../../../macros.inc' -include 'eth.inc' +include 'ETH.INC' include 'debug-fdo.inc' include 'dhcp.inc' include 'dll.inc' diff --git a/programs/system/disptest/trunk/disptest.ASM b/programs/system/disptest/trunk/disptest.ASM index 9a3959c24a..4d749258ad 100644 --- a/programs/system/disptest/trunk/disptest.ASM +++ b/programs/system/disptest/trunk/disptest.ASM @@ -12,7 +12,7 @@ include "..\..\..\MACROS.INC" ; <--- start of MenuetOS application ---> MEOS_APP_START -include "..\..\..\debug.inc" +;include "..\..\..\debug.inc" ; <--- start of code ---> diff --git a/programs/system/pcidev/trunk/PCIDEV.ASM b/programs/system/pcidev/trunk/PCIDEV.ASM index 18e46c2110..5d4f8034ed 100644 --- a/programs/system/pcidev/trunk/PCIDEV.ASM +++ b/programs/system/pcidev/trunk/PCIDEV.ASM @@ -529,7 +529,7 @@ mmio_next_bar: ret -include 'VENDORS.INC' +include 'vendors.inc' ;------------------------------------------------------------------ ; DATA AREA DATA diff --git a/programs/system/zkey/trunk/ZKEY.ASM b/programs/system/zkey/trunk/ZKEY.ASM index ce2c51f8dd..123ef837de 100644 --- a/programs/system/zkey/trunk/ZKEY.ASM +++ b/programs/system/zkey/trunk/ZKEY.ASM @@ -18,7 +18,7 @@ use32 dd 0x100000 ; required amount of memory dd 0x00000000 ; reserved=no extended header -include "aspAPI.inc" +include "ASPAPI.INC" N_KEYCOLOR equ 0x00677889 ; Normal button color C_KEYCOLOR equ 0x00344556 ; Control button color