From: MaartenBrock <MaartenBrock@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 7 Jan 2007 09:57:10 +0000 (+0000)
Subject: * as/as_gbz80.dsp, as/z80/as_gbz80.dsp,
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=6db7b4e474eae4e4113ce4f6e8bdad4ad44e94fd;hp=ccc1f449ac9245bfb35a9d0c23945bcecf1d8555;p=fw%2Fsdcc

* as/as_gbz80.dsp, as/z80/as_gbz80.dsp,
* as/as_z80.dsp,   as/z80/as_z80.dsp,
* as/asx8051.dsp,  as/mcs51/asx8051.dsp,
* sdcc.dsw: moved project files into subdir
* as/hc08/as_hc08.dsp,
* as/hc08/Makefile.bcc,
* as/hc08/Makefile.in,
* as/mcs51/Makefile.bcc,
* as/mcs51/Makefile.in,
* as/z80/Makefile.bcc,
* as/z80/Makefile.in,
* as/link/mcs51/Makefile.bcc: use as/strcmpi.c
* as/hc08/asm.h,
* as/mcs51/asm.h,
* as/z80/asm.h: added as_strcmpi() and as_strncmpi() prototypes
* as/hc08/asmain.c,
* as/hc08/assym.c,
* as/mcs51/asmain.c,
* as/mcs51/assym.c,
* as/z80/assym.c: removed include "strcmpi.h"
* as/hc08/strcmpi.c,
* as/hc08/strcmpi.h,
* as/mcs51/strcmpi.c,
* as/mcs51/strcmpi.h,
* support/Util/strcmpi.c,
* support/Util/strcmpi.h: removed files
* as/strcmpi.c: added as_strncmpi()

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4558 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/ChangeLog b/ChangeLog
index a9f014bb..26b9cfc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2007-01-06 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* as/as_gbz80.dsp, as/z80/as_gbz80.dsp,
+	* as/as_z80.dsp,   as/z80/as_z80.dsp,
+	* as/asx8051.dsp,  as/mcs51/asx8051.dsp,
+	* sdcc.dsw: moved project files into subdir
+	* as/hc08/as_hc08.dsp,
+	* as/hc08/Makefile.bcc,
+	* as/hc08/Makefile.in,
+	* as/mcs51/Makefile.bcc,
+	* as/mcs51/Makefile.in,
+	* as/z80/Makefile.bcc,
+	* as/z80/Makefile.in,
+	* as/link/mcs51/Makefile.bcc: use as/strcmpi.c
+	* as/hc08/asm.h,
+	* as/mcs51/asm.h,
+	* as/z80/asm.h: added as_strcmpi() and as_strncmpi() prototypes
+	* as/hc08/asmain.c,
+	* as/hc08/assym.c,
+	* as/mcs51/asmain.c,
+	* as/mcs51/assym.c,
+	* as/z80/assym.c: removed include "strcmpi.h"
+	* as/hc08/strcmpi.c,
+	* as/hc08/strcmpi.h,
+	* as/mcs51/strcmpi.c,
+	* as/mcs51/strcmpi.h,
+	* support/Util/strcmpi.c,
+	* support/Util/strcmpi.h: removed files
+	* as/strcmpi.c: added as_strncmpi()
+
 2007-01-05 Jesus Calvino-Fraga <jesusc at ece.ubc.ca>
 
 	* sdcc.dsw: Added some dependencies on project config.dsp
diff --git a/as/as_gbz80.dsp b/as/as_gbz80.dsp
deleted file mode 100644
index e8e26dbd..00000000
--- a/as/as_gbz80.dsp
+++ /dev/null
@@ -1,175 +0,0 @@
-# Microsoft Developer Studio Project File - Name="as_gbz80" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=as_gbz80 - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "as_gbz80.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "as_gbz80.mak" CFG="as_gbz80 - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "as_gbz80 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "as_gbz80 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "as_gbz80 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "z80\Debug_gbz80"
-# PROP BASE Intermediate_Dir "z80\Debug_gbz80"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "z80\Debug_gbz80"
-# PROP Intermediate_Dir "z80\Debug_gbz80"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\support\util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-gbz80.exe" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "as_gbz80 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "z80\Release_gbz80"
-# PROP BASE Intermediate_Dir "z80\Release_gbz80"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "z80\Release_gbz80"
-# PROP Intermediate_Dir "z80\Release_gbz80"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
-# ADD CPP /nologo /ML /W3 /GX /O2 /I "..\support\util" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-gbz80.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "as_gbz80 - Win32 Debug"
-# Name "as_gbz80 - Win32 Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\z80\asdata.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\asexpr.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\aslex.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\aslist.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\asmain.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\asout.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\assubr.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\assym.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# Begin Source File
-
-SOURCE=..\support\Util\strcmpi.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\z80adr.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\z80ext.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\z80mch.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\z80pst.c
-# ADD CPP /D "GAMEBOY"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\z80\alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\asm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\string.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\z80.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/as/as_z80.dsp b/as/as_z80.dsp
deleted file mode 100644
index 012b8a9b..00000000
--- a/as/as_z80.dsp
+++ /dev/null
@@ -1,167 +0,0 @@
-# Microsoft Developer Studio Project File - Name="as_z80" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=as_z80 - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "as_z80.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "as_z80.mak" CFG="as_z80 - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "as_z80 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "as_z80 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "as_z80 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "z80\Debug"
-# PROP BASE Intermediate_Dir "z80\Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "z80\Debug"
-# PROP Intermediate_Dir "z80\Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../support/util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "as_z80 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "z80\Release"
-# PROP BASE Intermediate_Dir "z80\Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "z80\Release"
-# PROP Intermediate_Dir "z80\Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
-# ADD CPP /nologo /ML /W3 /GX /O2 /I "..\support\util\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "as_z80 - Win32 Debug"
-# Name "as_z80 - Win32 Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\z80\asdata.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\asexpr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\aslex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\aslist.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\asmain.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\asout.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\assubr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\assym.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\support\Util\strcmpi.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\z80adr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\z80ext.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\z80mch.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\z80pst.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\z80\alloc.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\asm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\support\Util\strcmpi.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\string.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\z80\z80.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/as/asx8051.dsp b/as/asx8051.dsp
deleted file mode 100644
index f59aa2f4..00000000
--- a/as/asx8051.dsp
+++ /dev/null
@@ -1,167 +0,0 @@
-# Microsoft Developer Studio Project File - Name="asx8051" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=asx8051 - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "asx8051.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "asx8051.mak" CFG="asx8051 - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "asx8051 - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "asx8051 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "asx8051 - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept
-
-!ELSEIF  "$(CFG)" == "asx8051 - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Ignore_Export_Lib 0
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
-# ADD CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "asx8051 - Win32 Debug"
-# Name "asx8051 - Win32 Release"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=mcs51\asdata.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\asexpr.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\aslex.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\aslist.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\asmain.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\asnoice.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\asout.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\asstore.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\assubr.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\assym.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\i51adr.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\i51ext.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\i51mch.c
-# End Source File
-# Begin Source File
-
-SOURCE=mcs51\i51pst.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\mcs51\strcmpi.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\mcs51\asm.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mcs51\i8051.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\mcs51\strcmpi.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/as/hc08/Makefile.bcc b/as/hc08/Makefile.bcc
index a621c679..9a165ea4 100644
--- a/as/hc08/Makefile.bcc
+++ b/as/hc08/Makefile.bcc
@@ -6,7 +6,8 @@ PRJDIR          = ../..
 
 ASOBJECTS       = asmain.obj aslex.obj assym.obj assubr.obj asnoice.obj \
                   asexpr.obj asdata.obj aslist.obj asout.obj asstore.obj \
-                  h08ext.obj h08pst.obj h08mch.obj h08adr.obj strcmpi.obj
+                  h08ext.obj h08pst.obj h08mch.obj h08adr.obj \
+                  ../strcmpi.obj
 
 ASX8051         = $(PRJDIR)/bin/asx8051.exe
 
diff --git a/as/hc08/Makefile.in b/as/hc08/Makefile.in
index bb615d2c..87bb6c5c 100644
--- a/as/hc08/Makefile.in
+++ b/as/hc08/Makefile.in
@@ -40,7 +40,8 @@ LDFLAGS		= @LDFLAGS@
 
 ASOBJECTS	= asmain.o aslex.o assym.o assubr.o asnoice.o \
 		  asexpr.o asdata.o aslist.o asout.o asstore.o \
-		  m08ext.o m08pst.o m08mch.o m08adr.o strcmpi.o
+		  m08ext.o m08pst.o m08mch.o m08adr.o \
+		  ../strcmpi.o
 ASSOURCES	= $(patsubst %.o,%.c,$(ASOBJECTS))
 
 ASHC08		= $(top_builddir)/bin/as-hc08$(EXEEXT)
diff --git a/as/hc08/as_hc08.dsp b/as/hc08/as_hc08.dsp
index 67749bb1..55b49289 100644
--- a/as/hc08/as_hc08.dsp
+++ b/as/hc08/as_hc08.dsp
@@ -143,7 +143,7 @@ SOURCE=.\m08pst.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strcmpi.c
+SOURCE=..\strcmpi.c
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -157,10 +157,6 @@ SOURCE=.\asm.h
 
 SOURCE=.\m6808.h
 # End Source File
-# Begin Source File
-
-SOURCE=.\strcmpi.h
-# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/as/hc08/asm.h b/as/hc08/asm.h
index 5b6e8e13..81881bdf 100644
--- a/as/hc08/asm.h
+++ b/as/hc08/asm.h
@@ -677,10 +677,14 @@ extern void DefineCDB_Line();
 
 extern	char *		cpu;
 extern	char *		dsft;
-extern	int		hilo;
+extern	int 		hilo;
 extern	struct	mne	mne[];
 
 /* Machine dependent functions */
 
 extern	VOID		minit();
-extern VOID machine(struct mne *);
+extern	VOID		machine(struct mne *);
+
+/* strcmpi.c */
+extern  int as_strcmpi(const char *s1, const char *s2);
+extern  int as_strncmpi(const char *s1, const char *s2, size_t n);
diff --git a/as/hc08/asmain.c b/as/hc08/asmain.c
index 0332a438..53691ee6 100644
--- a/as/hc08/asmain.c
+++ b/as/hc08/asmain.c
@@ -17,7 +17,6 @@
 #include <string.h>
 
 #include "asm.h"
-#include "strcmpi.h"
 
 /*)Module	asmain.c
  *
diff --git a/as/hc08/assym.c b/as/hc08/assym.c
index 6f504dea..21d718d5 100644
--- a/as/hc08/assym.c
+++ b/as/hc08/assym.c
@@ -27,7 +27,6 @@
 #include <alloc.h>
 #endif
 #include "asm.h"
-#include "strcmpi.h"
 
 /*)Module	assym.c
  *
diff --git a/as/hc08/strcmpi.c b/as/hc08/strcmpi.c
deleted file mode 100644
index 434529ce..00000000
--- a/as/hc08/strcmpi.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* strcmpi.c */
-
-/*
- * Compare two strings ignoring case.
- *
- * Taken from GLIBC 2.2.5. Original code is copyrighted "Free
- * Software Foundation" and published under the GNU Lesser General
- * Public License.
- * 
- */
-
-#include <ctype.h>
-#include "strcmpi.h"
-
-int as_strcmpi (const char *s1, const char *s2)
-{
-  const unsigned char *p1 = (const unsigned char *) s1;
-  const unsigned char *p2 = (const unsigned char *) s2;
-  unsigned char c1, c2;
-
-  if (p1 == p2)
-    return 0;
-
-  do
-    {
-      c1 = tolower (*p1++);
-      c2 = tolower (*p2++);
-      if (c1 == '\0')
-	break;
-    }
-  while (c1 == c2);
-  
-  return c1 - c2;
-}
-
diff --git a/as/hc08/strcmpi.h b/as/hc08/strcmpi.h
deleted file mode 100644
index 63c35c43..00000000
--- a/as/hc08/strcmpi.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* strcmpi.h */
-
-int as_strcmpi (const char *s1, const char *s2);
diff --git a/as/link/mcs51/Makefile.bcc b/as/link/mcs51/Makefile.bcc
index a087b1d2..51c73f5d 100644
--- a/as/link/mcs51/Makefile.bcc
+++ b/as/link/mcs51/Makefile.bcc
@@ -4,12 +4,13 @@ PRJDIR          = ../..
 
 !include $(PRJDIR)/Bcc.inc
 
-LKOBJECTS       = lkmain.obj lkhead.obj lkarea.obj lkdata.obj \
-                  lkeval.obj lklex.obj lksym.obj lkrloc.obj \
-                  lklibr.obj lklist.obj lkihx.obj lks19.obj \
-                  lknoice.obj lkmem.obj lkaomf51.obj \
-                  ../lkstore.obj \
-                  strcmpi.obj
+LKOBJECTS       = lkmain.obj lkarea.obj lkdata.obj \
+                  lkrloc.obj \
+                  lklibr.obj lkihx.obj lks19.obj \
+                  lkmem.obj lkaomf51.obj \
+                  ../lkeval.obj ../lkhead.obj ../lklex.obj ../lklist.obj \
+                  ../lknoice.obj ../lkstore.obj ../lksym.obj \
+                  ../../strcmpi.obj
 
 ASLINK          = $(PRJDIR)/bin/aslink.exe
 
diff --git a/as/mcs51/Makefile.bcc b/as/mcs51/Makefile.bcc
index 97fc05a6..75876078 100644
--- a/as/mcs51/Makefile.bcc
+++ b/as/mcs51/Makefile.bcc
@@ -6,7 +6,8 @@ PRJDIR          = ../..
 
 ASOBJECTS       = asmain.obj aslex.obj assym.obj assubr.obj asnoice.obj \
                   asexpr.obj asdata.obj aslist.obj asout.obj asstore.obj \
-                  i51ext.obj i51pst.obj i51mch.obj i51adr.obj strcmpi.obj
+                  i51ext.obj i51pst.obj i51mch.obj i51adr.obj \
+                  ../strcmpi.obj
 
 ASX8051         = $(PRJDIR)/bin/asx8051.exe
 
diff --git a/as/mcs51/Makefile.in b/as/mcs51/Makefile.in
index 5b1aacbb..1e3d0952 100644
--- a/as/mcs51/Makefile.in
+++ b/as/mcs51/Makefile.in
@@ -40,7 +40,8 @@ LDFLAGS		= @LDFLAGS@
 
 ASOBJECTS	= asmain.o aslex.o assym.o assubr.o asnoice.o \
 		  asexpr.o asdata.o aslist.o asout.o asstore.o \
-		  i51ext.o i51pst.o i51mch.o i51adr.o strcmpi.o
+		  i51ext.o i51pst.o i51mch.o i51adr.o \
+		  ../strcmpi.o
 ASSOURCES	= $(patsubst %.o,%.c,$(ASOBJECTS))
 
 ASX8051		= $(top_builddir)/bin/asx8051$(EXEEXT)
diff --git a/as/mcs51/asm.h b/as/mcs51/asm.h
index 7b9c1f6f..08f9bcb1 100644
--- a/as/mcs51/asm.h
+++ b/as/mcs51/asm.h
@@ -697,4 +697,8 @@ extern  struct  mne     mne[];
 /* Machine dependent functions */
 
 extern  VOID            minit();
-extern VOID machine(struct mne *);
+extern  VOID            machine(struct mne *);
+
+/* strcmpi.c */
+extern  int as_strcmpi(const char *s1, const char *s2);
+extern  int as_strncmpi(const char *s1, const char *s2, size_t n);
diff --git a/as/mcs51/asmain.c b/as/mcs51/asmain.c
index a333ccea..1a506fbf 100644
--- a/as/mcs51/asmain.c
+++ b/as/mcs51/asmain.c
@@ -17,7 +17,6 @@
 #include <string.h>
 
 #include "asm.h"
-#include "strcmpi.h"
 
 /*)Module	asmain.c
  *
@@ -944,7 +943,7 @@ loop:
 			}
 		}
 		*p = 0;
-		if (++incfil == MAXINC ||
+		if ((++incfil == MAXINC) ||
 		   (ifp[incfil] = fopen(fn, "r")) == NULL) {
 			--incfil;
 			err('i');
diff --git a/as/mcs51/assym.c b/as/mcs51/assym.c
index 6f504dea..21d718d5 100644
--- a/as/mcs51/assym.c
+++ b/as/mcs51/assym.c
@@ -27,7 +27,6 @@
 #include <alloc.h>
 #endif
 #include "asm.h"
-#include "strcmpi.h"
 
 /*)Module	assym.c
  *
diff --git a/as/mcs51/asx8051.dsp b/as/mcs51/asx8051.dsp
new file mode 100644
index 00000000..cd30aab0
--- /dev/null
+++ b/as/mcs51/asx8051.dsp
@@ -0,0 +1,163 @@
+# Microsoft Developer Studio Project File - Name="asx8051" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=asx8051 - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "asx8051.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "asx8051.mak" CFG="asx8051 - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "asx8051 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "asx8051 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "asx8051 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "asx8051 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
+# ADD CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\asx8051.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "asx8051 - Win32 Debug"
+# Name "asx8051 - Win32 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\asdata.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\asexpr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aslex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aslist.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\asmain.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\asnoice.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\asout.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\asstore.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\assubr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\assym.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\i51adr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\i51ext.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\i51mch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\i51pst.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strcmpi.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\asm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\i8051.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/as/mcs51/strcmpi.c b/as/mcs51/strcmpi.c
deleted file mode 100644
index 434529ce..00000000
--- a/as/mcs51/strcmpi.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* strcmpi.c */
-
-/*
- * Compare two strings ignoring case.
- *
- * Taken from GLIBC 2.2.5. Original code is copyrighted "Free
- * Software Foundation" and published under the GNU Lesser General
- * Public License.
- * 
- */
-
-#include <ctype.h>
-#include "strcmpi.h"
-
-int as_strcmpi (const char *s1, const char *s2)
-{
-  const unsigned char *p1 = (const unsigned char *) s1;
-  const unsigned char *p2 = (const unsigned char *) s2;
-  unsigned char c1, c2;
-
-  if (p1 == p2)
-    return 0;
-
-  do
-    {
-      c1 = tolower (*p1++);
-      c2 = tolower (*p2++);
-      if (c1 == '\0')
-	break;
-    }
-  while (c1 == c2);
-  
-  return c1 - c2;
-}
-
diff --git a/as/mcs51/strcmpi.h b/as/mcs51/strcmpi.h
deleted file mode 100644
index 63c35c43..00000000
--- a/as/mcs51/strcmpi.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* strcmpi.h */
-
-int as_strcmpi (const char *s1, const char *s2);
diff --git a/as/strcmpi.c b/as/strcmpi.c
index 8c5ad454..c45ce9dc 100644
--- a/as/strcmpi.c
+++ b/as/strcmpi.c
@@ -10,6 +10,7 @@
  */
 
 #include <ctype.h>
+#include <stddef.h>
 
 int as_strcmpi (const char *s1, const char *s2)
 {
@@ -32,3 +33,23 @@ int as_strcmpi (const char *s1, const char *s2)
   return c1 - c2;
 }
 
+int as_strncmpi (const char *s1, const char *s2, size_t n)
+{
+  const unsigned char *p1 = (const unsigned char *) s1;
+  const unsigned char *p2 = (const unsigned char *) s2;
+  unsigned char c1, c2;
+
+  if ((p1 == p2) || (n == 0))
+    return 0;
+
+  do
+    {
+      c1 = tolower (*p1++);
+      c2 = tolower (*p2++);
+      if (c1 == '\0')
+	break;
+    }
+  while ((c1 == c2) && --n);
+
+  return c1 - c2;
+}
diff --git a/as/z80/Makefile.bcc b/as/z80/Makefile.bcc
index 784c7817..e1ca4a0f 100644
--- a/as/z80/Makefile.bcc
+++ b/as/z80/Makefile.bcc
@@ -1,4 +1,4 @@
-# Makefile for Borlad C
+# Makefile for Borland C
 
 PRJDIR          = ../..
 
@@ -7,8 +7,9 @@ PRJDIR          = ../..
 CFLAGS          = $(CFLAGS) -DINDEXLIB -DMLH_MAP -DSDK
 
 OBJECTS       = asdata.obj asexpr.obj aslex.obj aslist.obj asmain.obj \
-                  asout.obj assubr.obj assym.obj z80adr.obj z80ext.obj \
-                  z80mch.obj z80pst.obj
+                asout.obj assubr.obj assym.obj z80adr.obj z80ext.obj \
+                z80mch.obj z80pst.obj \
+                ../strcmpi.obj
 
 TARGET         = $(PRJDIR)/bin/as-z80.exe
 
diff --git a/as/z80/Makefile.in b/as/z80/Makefile.in
index 726274c3..c2ff4f19 100644
--- a/as/z80/Makefile.in
+++ b/as/z80/Makefile.in
@@ -9,7 +9,7 @@ OBJDIR	= obj/$(EXT)
 
 SDC	= .
 
-SLIBSRC	= NewAlloc.c strcmpi.c
+SLIBSRC	= NewAlloc.c ../strcmpi.c
 
 SRC	= asdata.c asexpr.c aslex.c aslist.c asmain.c asout.c \
 	  assubr.c assym.c z80adr.c z80ext.c z80mch.c z80pst.c
diff --git a/as/z80/as_gbz80.dsp b/as/z80/as_gbz80.dsp
new file mode 100644
index 00000000..48c59d4d
--- /dev/null
+++ b/as/z80/as_gbz80.dsp
@@ -0,0 +1,175 @@
+# Microsoft Developer Studio Project File - Name="as_gbz80" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=as_gbz80 - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "as_gbz80.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "as_gbz80.mak" CFG="as_gbz80 - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "as_gbz80 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "as_gbz80 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "as_gbz80 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug_gbz80"
+# PROP BASE Intermediate_Dir "Debug_gbz80"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_gbz80"
+# PROP Intermediate_Dir "Debug_gbz80"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\support\util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-gbz80.exe" /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "as_gbz80 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Release_gbz80"
+# PROP BASE Intermediate_Dir "Release_gbz80"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Release_gbz80"
+# PROP Intermediate_Dir "Release_gbz80"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
+# ADD CPP /nologo /ML /W3 /GX /O2 /I "..\support\util" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-gbz80.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "as_gbz80 - Win32 Debug"
+# Name "as_gbz80 - Win32 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\asdata.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# Begin Source File
+
+SOURCE=.\asexpr.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# Begin Source File
+
+SOURCE=.\aslex.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# Begin Source File
+
+SOURCE=.\aslist.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# Begin Source File
+
+SOURCE=.\asmain.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# Begin Source File
+
+SOURCE=.\asout.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# Begin Source File
+
+SOURCE=.\assubr.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# Begin Source File
+
+SOURCE=.\assym.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# Begin Source File
+
+SOURCE=..\strcmpi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80adr.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80ext.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80mch.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80pst.c
+# ADD CPP /D "GAMEBOY"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\asm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\string.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/as/z80/as_z80.dsp b/as/z80/as_z80.dsp
new file mode 100644
index 00000000..cb9d6fd8
--- /dev/null
+++ b/as/z80/as_z80.dsp
@@ -0,0 +1,163 @@
+# Microsoft Developer Studio Project File - Name="as_z80" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=as_z80 - Win32 Release
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "as_z80.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "as_z80.mak" CFG="as_z80 - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "as_z80 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "as_z80 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "as_z80 - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../support/util" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FR /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /debug /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
+
+!ELSEIF  "$(CFG)" == "as_z80 - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
+# ADD CPP /nologo /ML /W3 /GX /O2 /I "..\support\util\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "INDEXLIB" /D "MLH_MAP" /D "SDK" /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
+# ADD LINK32 /nologo /subsystem:console /machine:I386 /out:"..\bin_vc\as-z80.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "as_z80 - Win32 Debug"
+# Name "as_z80 - Win32 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\asdata.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\asexpr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aslex.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\aslist.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\asmain.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\asout.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\assubr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\assym.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\strcmpi.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80adr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80ext.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80mch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80pst.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\asm.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\string.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\z80.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/as/z80/asm.h b/as/z80/asm.h
index 91de7ae1..812f20bc 100644
--- a/as/z80/asm.h
+++ b/as/z80/asm.h
@@ -592,10 +592,13 @@ extern	VOID		out_tw();
 
 extern	char *		cpu;
 extern	char *		dsft;
-extern	int		hilo;
+extern	int 		hilo;
 extern	struct	mne	mne[];
 
 /* Machine dependent functions */
 
 extern	VOID		minit();
 
+/* strcmpi.c */
+extern	int as_strcmpi(const char *s1, const char *s2);
+extern	int as_strncmpi(const char *s1, const char *s2, size_t n);
diff --git a/as/z80/assym.c b/as/z80/assym.c
index 77e0c268..771f5320 100644
--- a/as/z80/assym.c
+++ b/as/z80/assym.c
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include "asm.h"
-#include "strcmpi.h"
 
 /*)Module	assym.c
  *
diff --git a/sdcc.dsw b/sdcc.dsw
index 6bd6de36..0d7fd419 100644
--- a/sdcc.dsw
+++ b/sdcc.dsw
@@ -51,7 +51,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "as_gbz80"=.\as\as_gbz80.dsp - Package Owner=<4>
+Project: "as_gbz80"=.\as\z80\as_gbz80.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -75,7 +75,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "as_z80"=.\as\as_z80.dsp - Package Owner=<4>
+Project: "as_z80"=.\as\z80\as_z80.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -102,7 +102,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "asx8051"=.\as\asx8051.dsp - Package Owner=<4>
+Project: "asx8051"=.\as\mcs51\asx8051.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -489,7 +489,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "z80"=.\SRC\z80\z80.dsp - Package Owner=<4>
+Project: "z80"=.\src\z80\z80.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/support/Util/strcmpi.c b/support/Util/strcmpi.c
deleted file mode 100644
index c812ef0a..00000000
--- a/support/Util/strcmpi.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* strcmpi.c */
-
-/*
- * Compare two strings ignoring case.
- *
- * Taken from GLIBC 2.2.5. Original code is copyrighted "Free
- * Software Foundation" and published under the GNU Lesser General
- * Public License.
- * 
- */
-
-#include <ctype.h>
-#include "strcmpi.h"
-
-int as_strcmpi (const char *s1, const char *s2)
-{
-  const unsigned char *p1 = (const unsigned char *) s1;
-  const unsigned char *p2 = (const unsigned char *) s2;
-  unsigned char c1, c2;
-
-  if (p1 == p2)
-    return 0;
-
-  do
-    {
-      c1 = tolower (*p1++);
-      c2 = tolower (*p2++);
-      if (c1 == '\0')
-	break;
-    }
-  while (c1 == c2);
-  
-  return c1 - c2;
-}
-
diff --git a/support/Util/strcmpi.h b/support/Util/strcmpi.h
deleted file mode 100644
index b284f48a..00000000
--- a/support/Util/strcmpi.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* strcmpi.h */
-
-int as_strcmpi (const char *s1, const char *s2);