From 286a1a9a3918608210a7ed7b8b00f20324af58ba Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Fri, 3 May 2013 22:38:54 +0000 Subject: [PATCH] Try to fix r.3491 git-svn-id: svn://kolibrios.org@3494 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/lang_nasm.inc | 1 + data/it/lang_nasm.inc | 1 + data/rus/lang_nasm.inc | 1 + data/sp/lang_nasm.inc | 1 + programs/games/c4/trunk/c4.asm | 2 +- programs/games/c4/trunk/makefile | 8 ++++---- 6 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 data/eng/lang_nasm.inc create mode 100644 data/it/lang_nasm.inc create mode 100644 data/rus/lang_nasm.inc create mode 100644 data/sp/lang_nasm.inc diff --git a/data/eng/lang_nasm.inc b/data/eng/lang_nasm.inc new file mode 100644 index 0000000000..f7459c9526 --- /dev/null +++ b/data/eng/lang_nasm.inc @@ -0,0 +1 @@ +lang equ 'en' \ No newline at end of file diff --git a/data/it/lang_nasm.inc b/data/it/lang_nasm.inc new file mode 100644 index 0000000000..19fa012fea --- /dev/null +++ b/data/it/lang_nasm.inc @@ -0,0 +1 @@ +lang equ 'it' \ No newline at end of file diff --git a/data/rus/lang_nasm.inc b/data/rus/lang_nasm.inc new file mode 100644 index 0000000000..0dc4a556e5 --- /dev/null +++ b/data/rus/lang_nasm.inc @@ -0,0 +1 @@ +lang equ 'ru' \ No newline at end of file diff --git a/data/sp/lang_nasm.inc b/data/sp/lang_nasm.inc new file mode 100644 index 0000000000..0a3e1db1c3 --- /dev/null +++ b/data/sp/lang_nasm.inc @@ -0,0 +1 @@ +lang equ 'sp' \ No newline at end of file diff --git a/programs/games/c4/trunk/c4.asm b/programs/games/c4/trunk/c4.asm index e38c5ca90a..071d43c017 100644 --- a/programs/games/c4/trunk/c4.asm +++ b/programs/games/c4/trunk/c4.asm @@ -21,7 +21,7 @@ bits 32 %include 'mos.inc' section .text - %include 'lang.inc' ;fedesco + %include 'lang_nasm.inc' ;fedesco MOS_HEADER01 start,end diff --git a/programs/games/c4/trunk/makefile b/programs/games/c4/trunk/makefile index 48ec595080..4a4e57e048 100644 --- a/programs/games/c4/trunk/makefile +++ b/programs/games/c4/trunk/makefile @@ -4,7 +4,7 @@ FASM=/opt/bin/fasm NASM=/usr/bin/nasm KPACK=/opt/bin/kpack -LANG=lang.inc +LANG=lang_nasm.inc FILE=c4 SOURCE=${FILE}.asm OUT=${FILE}.bin @@ -12,12 +12,12 @@ OUT=${FILE}.bin all:en en: - echo "lang equ 'en'" > lang.inc + echo "lang equ 'en'" > lang_nasm.inc ${NASM} -f bin -o ${OUT} ${SOURCE} it: - echo "lang equ 'it'" > lang.inc + echo "lang equ 'it'" > lang_nasm.inc ${NASM} -f bin -o ${OUT} ${SOURCE} clean: - rm -f ${OUT} lang.inc + rm -f ${OUT} lang_nasm.inc