Visual Studio 6.0 build files (including generated .mak files) reflecting new

source tree structure. svn path=/trunk/yasm/; revision=864
22 years ago · 6c455ea6e2
parent b90b2b3b88
commit 6c455ea6e2
16 changed files with 3378 additions and 20 deletions
--- a/Mkfiles/vc/.cvsignore
+++ b/Mkfiles/vc/.cvsignore
@ -0,0 +1,5 @@
+Debug
+Release
+yasm.plg
+yasm.ncb
+yasm.opt
--- a/Mkfiles/vc/config.h
+++ b/Mkfiles/vc/config.h
@ -30,18 +30,12 @@
 /* Define to 1 if you have the <assert.h> header file. */
 /* #undef HAVE_ASSERT_H */

-/* Define to 1 if you have the `basename' function. */
-#define HAVE_BASENAME 1
-
 /* Define to 1 if you have the `bcopy' function. */
 /* #undef HAVE_BCOPY */

 /* */
 /* #undef HAVE_CATGETS */

-/* Define to 1 if you have the `closedir' function. */
-/* #undef HAVE_CLOSEDIR */
-
 /* Define to 1 if you have the <ctype.h> header file. */
 #define HAVE_CTYPE_H 1

@ -104,8 +98,7 @@
 /* Define if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1

-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-   to 0 otherwise. */
+/* Define if your system has a working `malloc' function. */
 #define HAVE_MALLOC 1

 /* Define if you have the <malloc.h> header file. */
@ -138,15 +131,9 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 /* #undef HAVE_NDIR_H */

-/* Define to 1 if you have the `opendir' function. */
-/* #undef HAVE_OPENDIR */
-
 /* Define if libtool can extract symbol lists from object files. */
 /* #undef HAVE_PRELOADED_SYMBOLS */

-/* Define to 1 if you have the `readdir' function. */
-/* #undefine HAVE_READDIR */
-
 /* Define to 1 if you have the `rindex' function. */
 /* #undef HAVE_RINDEX */

@ -297,13 +284,13 @@
 #define PACKAGE_NAME "yasm"

 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm CVS"
+#define PACKAGE_STRING "yasm `date "+%Y%m%d"`"

 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "yasm"

 /* Define to the version of this package. */
-#define PACKAGE_VERSION "CVS"
+#define PACKAGE_VERSION "`date "+%Y%m%d"`"

 /* Define if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
@ -315,11 +302,15 @@
 /* #undef USE_FORKWAITMSG */

 /* Version number of package */
-#define VERSION "CVS"
+#define VERSION "0.1.0"

 /* Define if using the dmalloc debugging malloc package */
 /* #undef WITH_DMALLOC */

+/* Define if `lex' declares `yytext' as a `char *' by default, not a `char[]'.
+   */
+#define YYTEXT_POINTER 1
+
 /* Make sure we see all GNU extensions. */
 /* #undef _GNU_SOURCE */

@ -339,9 +330,6 @@
   if it is not supported. */
 /* #undef inline */

-/* Define to rpl_malloc if the replacement function should be used. */
-/* #undef malloc */
-
 /* Define to `int' if <sys/types.h> doesn't define. */
 #define pid_t int

--- a/Mkfiles/vc/libyasm/.cvsignore
+++ b/Mkfiles/vc/libyasm/.cvsignore
@ -0,0 +1,3 @@
+Debug
+Release
+libyasm.plg
--- a/Mkfiles/vc/libyasm/config.h
+++ b/Mkfiles/vc/libyasm/config.h
@ -0,0 +1,340 @@
+/* $IdPath$ */
+
+/* */
+/* #undef ENABLE_NLS */
+
+/* Define if you have the `abort' function. */
+#define HAVE_ABORT 1
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
+/* #undef HAVE_ALLOCA_H */
+
+/* Define to 1 if you have the `argz_append' function. */
+/* #undef HAVE_ARGZ_APPEND */
+
+/* Define to 1 if you have the `argz_create_sep' function. */
+/* #undef HAVE_ARGZ_CREATE_SEP */
+
+/* Define if you have the <argz.h> header file. */
+/* #undef HAVE_ARGZ_H */
+
+/* Define to 1 if you have the `argz_insert' function. */
+/* #undef HAVE_ARGZ_INSERT */
+
+/* Define to 1 if you have the `argz_next' function. */
+/* #undef HAVE_ARGZ_NEXT */
+
+/* Define to 1 if you have the `argz_stringify' function. */
+/* #undef HAVE_ARGZ_STRINGIFY */
+
+/* Define to 1 if you have the <assert.h> header file. */
+/* #undef HAVE_ASSERT_H */
+
+/* Define to 1 if you have the `bcopy' function. */
+/* #undef HAVE_BCOPY */
+
+/* */
+/* #undef HAVE_CATGETS */
+
+/* Define to 1 if you have the <ctype.h> header file. */
+#define HAVE_CTYPE_H 1
+
+/* Define if the GNU dcgettext() function is already present or preinstalled.
+   */
+/* #undef HAVE_DCGETTEXT */
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_DIRENT_H */
+
+/* Define if you have the GNU dld library. */
+/* #undef HAVE_DLD */
+
+/* Define to 1 if you have the <dld.h> header file. */
+/* #undef HAVE_DLD_H */
+
+/* Define to 1 if you have the `dlerror' function. */
+/* #undef HAVE_DLERROR */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define to 1 if you have the <dl.h> header file. */
+/* #undef HAVE_DL_H */
+
+/* Define if you don't have `vprintf' but do have `_doprnt'. */
+/* #undef HAVE_DOPRNT */
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if the system has the type `error_t'. */
+/* #undef HAVE_ERROR_T */
+
+/* Define if you have the `fork' function. */
+/* #undef HAVE_FORK */
+
+/* */
+/* #undef HAVE_GETTEXT */
+
+/* Define if you have the GNU C Library */
+/* #undef HAVE_GNU_C_LIBRARY */
+
+/* Define if you have the iconv() function. */
+/* #undef HAVE_ICONV */
+
+/* Define to 1 if you have the `index' function. */
+/* #undef HAVE_INDEX */
+
+/* Define if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* */
+/* #undef HAVE_LC_MESSAGES */
+
+/* Define if you have the libdl library or equivalent. */
+/* #undef HAVE_LIBDL */
+
+/* Define if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Define if your system has a working `malloc' function. */
+#define HAVE_MALLOC 1
+
+/* Define if you have the <malloc.h> header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define if you have the `memcpy' function. */
+#define HAVE_MEMCPY 1
+
+/* Define if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define if you have the <memory.h> header file. */
+/* #undef HAVE_MEMORY_H */
+
+/* Define if you have the `mergesort function. */
+/* #undef HAVE_MERGESORT */
+
+/* Define if you have the `msgctl' function. */
+/* #undef HAVE_MSGCTL */
+
+/* Define if you have the `msgget' function. */
+/* #undef HAVE_MSGGET */
+
+/* Define if you have the `msgrcv' function. */
+/* #undef HAVE_MSGRCV */
+
+/* Define if you have the `msgsnd' function. */
+/* #undef HAVE_MSGSND */
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
+
+/* Define if libtool can extract symbol lists from object files. */
+/* #undef HAVE_PRELOADED_SYMBOLS */
+
+/* Define to 1 if you have the `rindex' function. */
+/* #undef HAVE_RINDEX */
+
+/* Define if you have the shl_load function. */
+/* #undef HAVE_SHL_LOAD */
+
+/* Define if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+#define snprintf _snprintf
+
+/* Define if you have the <stdint.h> header file. */
+/* #undef HAVE_STDINT_H */
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* */
+/* #undef HAVE_STPCPY */
+
+/* Define if you have the `strcasecmp' function. */
+/* #undef HAVE_STRCASECMP */
+
+/* Define if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strcmp' function. */
+#define HAVE_STRCMP 1
+
+/* Define if you have the `strcmpi' function. */
+#define HAVE_STRCMPI 1
+#define strcmpi _strcmpi
+
+/* Define if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define if you have the `stricmp' function. */
+#define HAVE_STRICMP 1
+#define stricmp _stricmp
+
+/* Define if you have the <strings.h> header file. */
+/* #undef HAVE_STRINGS_H */
+
+/* Define if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define if you have the `strncasecmp' function. */
+/* #undef HAVE_STRNCASECMP */
+
+/* Define if you have the `strrchr' function. */
+/* #undef HAVE_STRRCHR */
+
+/* Define if you have the `strsep' function. */
+/* #undef HAVE_STRSEP */
+
+/* Define if you have the <sys/cdefs.h> header file. */
+/* #undef HAVE_SYS_CDEFS_H */
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_DIR_H */
+
+/* Define to 1 if you have the <sys/dl.h> header file. */
+/* #undef HAVE_SYS_DL_H */
+
+/* Define if you have the <sys/ipc.h> header file. */
+/* #undef HAVE_SYS_IPC_H */
+
+/* Define if you have the <sys/msg.h> header file. */
+/* #undef HAVE_SYS_MSG_H */
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_NDIR_H */
+
+/* Define if you have the <sys/param.h> header file. */
+/* #undef HAVE_SYS_PARAM_H */
+
+/* Define if you have the <sys/queue.h> header file. */
+/* #undef HAVE_SYS_QUEUE_H */
+
+/* Define if you have the <sys/stat.h> header file. */
+/* #undef HAVE_SYS_STAT_H */
+
+/* Define if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible. */
+/* #undef HAVE_SYS_WAIT_H */
+
+/* Define if you have the `toascii' function. */
+#define HAVE_TOASCII 1
+#define toascii __toascii
+
+/* Define if you have the <unistd.h> header file. */
+/* #undef HAVE_UNISTD_H */
+
+/* Define if you have the `vfork' function. */
+/* #undef HAVE_VFORK */
+
+/* Define if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
+
+/* Define if you have the vprintf function. */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if you have the `vsnprintf' function. */
+/* #undef HAVE_VSNPRINTF */
+
+/* Define if you have the `wait' function. */
+/* #undef HAVE_WAIT */
+
+/* Define if `fork' works. */
+/* #undef HAVE_WORKING_FORK */
+
+/* Define if `vfork' works. */
+/* #undef HAVE_WORKING_VFORK */
+
+/* Define if the OS needs help to load dependent libraries for dlopen(). */
+#define LTDL_DLOPEN_DEPLIBS 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LTDL_OBJDIR ".libs/"
+
+/* Define to the name of the environment variable that determines the dynamic
+   library search path. */
+#define LTDL_SHLIBPATH_VAR "PATH"
+
+/* Define to the extension used for shared libraries, say, ".so". */
+#define LTDL_SHLIB_EXT ".dll"
+
+/* Define to the system default library search path. */
+#define LTDL_SYSSEARCHPATH "/lib:/usr/lib"
+
+/* Define if dlsym() requires a leading underscode in symbol names. */
+/* #undef NEED_USCORE */
+
+/* Name of package */
+#define PACKAGE "yasm"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "bug-yasm@tortall.net"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "yasm"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "yasm `date "+%Y%m%d"`"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "yasm"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "`date "+%Y%m%d"`"
+
+/* Define if the C compiler supports function prototypes. */
+#define PROTOTYPES 1
+
+/* Define if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Combined test for fork/wait/msg* */
+/* #undef USE_FORKWAITMSG */
+
+/* Version number of package */
+#define VERSION "0.1.0"
+
+/* Define if using the dmalloc debugging malloc package */
+/* #undef WITH_DMALLOC */
+
+/* Define if `lex' declares `yytext' as a `char *' by default, not a `char[]'.
+   */
+#define YYTEXT_POINTER 1
+
+/* Make sure we see all GNU extensions. */
+/* #undef _GNU_SOURCE */
+
+/* Make sure we see all SVID extensions. */
+/* #undef _SVID_SOURCE */
+
+/* Define like PROTOTYPES; this can be used by system headers. */
+#define __PROTOTYPES 1
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to a type to use for `error_t' if it is not otherwise available. */
+#define error_t int
+
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
+/* #undef inline */
+
+/* Define to `int' if <sys/types.h> doesn't define. */
+#define pid_t int
+
+/* Define to `unsigned' if <sys/types.h> doesn't define. */
+/* #undef size_t */
+
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */
--- a/Mkfiles/vc/libyasm/libyasm.dep
+++ b/Mkfiles/vc/libyasm/libyasm.dep
@ -0,0 +1,181 @@
+# Microsoft Developer Studio Generated Dependency File, included by libyasm.mak
+
+..\..\..\libyasm\arch.c : \
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\bitvect.c : \
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\bytecode.c : \
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bc-int.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr-int.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\errwarn.c : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\expr.c : \
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr-int.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\file.c : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\floatnum.c : \
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\hamt.c : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\intnum.c : \
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\linemgr.c : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\mergesort.c : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\section.c : \
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\strcasecmp.c : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\strsep.c : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\symrec.c : \
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\valparam.c : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\xmalloc.c : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
+
+..\..\..\libyasm\xstrdup.c : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\valparam.h"\
+	".\config.h"\
+	
--- a/Mkfiles/vc/libyasm/libyasm.dsp
+++ b/Mkfiles/vc/libyasm/libyasm.dsp
@ -0,0 +1,260 @@
+# Microsoft Developer Studio Project File - Name="libyasm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=libyasm - Win32 Debug
+!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 "libyasm.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 "libyasm.mak" CFG="libyasm - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libyasm - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libyasm - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libyasm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".." /I "../../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "libyasm - 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 Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "../../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libyasm - Win32 Release"
+# Name "libyasm - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\arch.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\bitvect.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\bytecode.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\errwarn.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\expr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\file.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\floatnum.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\hamt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\intnum.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\linemgr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\mergesort.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\section.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\strcasecmp.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\strsep.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\symrec.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\valparam.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\xmalloc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\xstrdup.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\arch.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\libyasm\bc-int.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\bitvect.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\bytecode.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\libyasm\compat-queue.h"
+# End Source File
+# Begin Source File
+
+SOURCE=.\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\coretype.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\dbgfmt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\errwarn.h
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\libyasm\expr-int.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\expr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\file.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\floatnum.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\hamt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\intnum.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\linemgr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\objfmt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\optimizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\parser.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\preproc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\section.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\symrec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\util.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\libyasm\valparam.h
+# End Source File
+# End Group
+# End Target
+# End Project
--- a/Mkfiles/vc/libyasm/libyasm.mak
+++ b/Mkfiles/vc/libyasm/libyasm.mak
@ -0,0 +1,354 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on libyasm.dsp
+!IF "$(CFG)" == ""
+CFG=libyasm - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to libyasm - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "libyasm - Win32 Release" && "$(CFG)" != "libyasm - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!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 "libyasm.mak" CFG="libyasm - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libyasm - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "libyasm - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "libyasm - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+ALL : "$(OUTDIR)\libyasm.lib"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\arch.obj"
+	-@erase "$(INTDIR)\bitvect.obj"
+	-@erase "$(INTDIR)\bytecode.obj"
+	-@erase "$(INTDIR)\errwarn.obj"
+	-@erase "$(INTDIR)\expr.obj"
+	-@erase "$(INTDIR)\file.obj"
+	-@erase "$(INTDIR)\floatnum.obj"
+	-@erase "$(INTDIR)\hamt.obj"
+	-@erase "$(INTDIR)\intnum.obj"
+	-@erase "$(INTDIR)\linemgr.obj"
+	-@erase "$(INTDIR)\mergesort.obj"
+	-@erase "$(INTDIR)\section.obj"
+	-@erase "$(INTDIR)\strcasecmp.obj"
+	-@erase "$(INTDIR)\strsep.obj"
+	-@erase "$(INTDIR)\symrec.obj"
+	-@erase "$(INTDIR)\valparam.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\xmalloc.obj"
+	-@erase "$(INTDIR)\xstrdup.obj"
+	-@erase "$(OUTDIR)\libyasm.lib"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I ".." /I "../../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\libyasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libyasm.bsc" 
+BSC32_SBRS= \
+	
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libyasm.lib" 
+LIB32_OBJS= \
+	"$(INTDIR)\arch.obj" \
+	"$(INTDIR)\bitvect.obj" \
+	"$(INTDIR)\bytecode.obj" \
+	"$(INTDIR)\errwarn.obj" \
+	"$(INTDIR)\expr.obj" \
+	"$(INTDIR)\file.obj" \
+	"$(INTDIR)\floatnum.obj" \
+	"$(INTDIR)\hamt.obj" \
+	"$(INTDIR)\intnum.obj" \
+	"$(INTDIR)\linemgr.obj" \
+	"$(INTDIR)\mergesort.obj" \
+	"$(INTDIR)\section.obj" \
+	"$(INTDIR)\strcasecmp.obj" \
+	"$(INTDIR)\strsep.obj" \
+	"$(INTDIR)\symrec.obj" \
+	"$(INTDIR)\valparam.obj" \
+	"$(INTDIR)\xmalloc.obj" \
+	"$(INTDIR)\xstrdup.obj"
+
+"$(OUTDIR)\libyasm.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "libyasm - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+ALL : "$(OUTDIR)\libyasm.lib"
+
+
+CLEAN :
+	-@erase "$(INTDIR)\arch.obj"
+	-@erase "$(INTDIR)\bitvect.obj"
+	-@erase "$(INTDIR)\bytecode.obj"
+	-@erase "$(INTDIR)\errwarn.obj"
+	-@erase "$(INTDIR)\expr.obj"
+	-@erase "$(INTDIR)\file.obj"
+	-@erase "$(INTDIR)\floatnum.obj"
+	-@erase "$(INTDIR)\hamt.obj"
+	-@erase "$(INTDIR)\intnum.obj"
+	-@erase "$(INTDIR)\linemgr.obj"
+	-@erase "$(INTDIR)\mergesort.obj"
+	-@erase "$(INTDIR)\section.obj"
+	-@erase "$(INTDIR)\strcasecmp.obj"
+	-@erase "$(INTDIR)\strsep.obj"
+	-@erase "$(INTDIR)\symrec.obj"
+	-@erase "$(INTDIR)\valparam.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\xmalloc.obj"
+	-@erase "$(INTDIR)\xstrdup.obj"
+	-@erase "$(OUTDIR)\libyasm.lib"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I ".." /I "../../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\libyasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libyasm.bsc" 
+BSC32_SBRS= \
+	
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libyasm.lib" 
+LIB32_OBJS= \
+	"$(INTDIR)\arch.obj" \
+	"$(INTDIR)\bitvect.obj" \
+	"$(INTDIR)\bytecode.obj" \
+	"$(INTDIR)\errwarn.obj" \
+	"$(INTDIR)\expr.obj" \
+	"$(INTDIR)\file.obj" \
+	"$(INTDIR)\floatnum.obj" \
+	"$(INTDIR)\hamt.obj" \
+	"$(INTDIR)\intnum.obj" \
+	"$(INTDIR)\linemgr.obj" \
+	"$(INTDIR)\mergesort.obj" \
+	"$(INTDIR)\section.obj" \
+	"$(INTDIR)\strcasecmp.obj" \
+	"$(INTDIR)\strsep.obj" \
+	"$(INTDIR)\symrec.obj" \
+	"$(INTDIR)\valparam.obj" \
+	"$(INTDIR)\xmalloc.obj" \
+	"$(INTDIR)\xstrdup.obj"
+
+"$(OUTDIR)\libyasm.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("libyasm.dep")
+!INCLUDE "libyasm.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "libyasm.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "libyasm - Win32 Release" || "$(CFG)" == "libyasm - Win32 Debug"
+SOURCE=..\..\..\libyasm\arch.c
+
+"$(INTDIR)\arch.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\bitvect.c
+
+"$(INTDIR)\bitvect.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\bytecode.c
+
+"$(INTDIR)\bytecode.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\errwarn.c
+
+"$(INTDIR)\errwarn.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\expr.c
+
+"$(INTDIR)\expr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\file.c
+
+"$(INTDIR)\file.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\floatnum.c
+
+"$(INTDIR)\floatnum.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\hamt.c
+
+"$(INTDIR)\hamt.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\intnum.c
+
+"$(INTDIR)\intnum.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\linemgr.c
+
+"$(INTDIR)\linemgr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\mergesort.c
+
+"$(INTDIR)\mergesort.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\section.c
+
+"$(INTDIR)\section.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\strcasecmp.c
+
+"$(INTDIR)\strcasecmp.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\strsep.c
+
+"$(INTDIR)\strsep.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\symrec.c
+
+"$(INTDIR)\symrec.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\valparam.c
+
+"$(INTDIR)\valparam.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\xmalloc.c
+
+"$(INTDIR)\xmalloc.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\libyasm\xstrdup.c
+
+"$(INTDIR)\xstrdup.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+
+!ENDIF 
+
--- a/Mkfiles/vc/modules/.cvsignore
+++ b/Mkfiles/vc/modules/.cvsignore
@ -0,0 +1,3 @@
+Debug
+Release
+modules.plg
--- a/Mkfiles/vc/modules/modules.dep
+++ b/Mkfiles/vc/modules/modules.dep
@ -0,0 +1,443 @@
+# Microsoft Developer Studio Generated Dependency File, included by modules.mak
+
+..\..\..\modules\arch\x86\x86arch.c : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\arch\x86\x86arch.h"\
+	"..\libyasm\config.h"\
+	
+
+..\..\..\modules\arch\x86\x86bc.c : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bc-int.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\arch\x86\x86arch.h"\
+	"..\libyasm\config.h"\
+	
+
+..\..\..\modules\arch\x86\x86expr.c : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr-int.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\arch\x86\x86arch.h"\
+	"..\libyasm\config.h"\
+	
+
+..\..\..\x86id.c : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bc-int.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr-int.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\arch\x86\x86arch.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\modules\dbgfmts\null\null-dbgfmt.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\modules\objfmts\bin\bin-objfmt.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bc-int.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr-int.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\modules\objfmts\coff\coff-objfmt.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bc-int.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr-int.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\modules\objfmts\dbg\dbg-objfmt.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\modules\optimizers\basic\basic-optimizer.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bc-int.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\nasm-bison.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr-int.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\parsers\nasm\nasm-defs.h"\
+	"..\..\..\modules\parsers\nasm\nasm-parser.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\modules\parsers\nasm\nasm-parser.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\parsers\nasm\nasm-parser.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\nasm-token.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\parsers\nasm\nasm-defs.h"\
+	"..\..\..\modules\parsers\nasm\nasm-parser.h"\
+	"..\..\..\nasm-bison.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\modules\preprocs\nasm\nasm-eval.c" : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\preprocs\nasm\nasm-eval.h"\
+	"..\..\..\modules\preprocs\nasm\nasm.h"\
+	"..\..\..\modules\preprocs\nasm\nasmlib.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\modules\preprocs\nasm\nasm-pp.c" : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\preprocs\nasm\nasm-pp.h"\
+	"..\..\..\modules\preprocs\nasm\nasm.h"\
+	"..\..\..\modules\preprocs\nasm\nasmlib.h"\
+	"..\..\..\nasm-macros.c"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\modules\preprocs\nasm\nasm-preproc.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\preprocs\nasm\nasm-eval.h"\
+	"..\..\..\modules\preprocs\nasm\nasm-pp.h"\
+	"..\..\..\modules\preprocs\nasm\nasm.h"\
+	"..\..\..\modules\preprocs\nasm\nasmlib.h"\
+	"..\libyasm\config.h"\
+	
+
+..\..\..\modules\preprocs\nasm\nasmlib.c : \
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\preprocs\nasm\nasm.h"\
+	"..\..\..\modules\preprocs\nasm\nasmlib.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\modules\preprocs\yapp\yapp-preproc.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\preprocs\yapp\yapp-preproc.h"\
+	"..\..\..\modules\preprocs\yapp\yapp-token.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\yapp-token.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\..\..\modules\preprocs\yapp\yapp-preproc.h"\
+	"..\..\..\modules\preprocs\yapp\yapp-token.h"\
+	"..\libyasm\config.h"\
+	
+
+"..\..\..\modules\preprocs\raw\raw-preproc.c" : \
+	"..\..\..\libyasm.h"\
+	"..\..\..\libyasm\arch.h"\
+	"..\..\..\libyasm\bitvect.h"\
+	"..\..\..\libyasm\bytecode.h"\
+	"..\..\..\libyasm\compat-queue.h"\
+	"..\..\..\libyasm\coretype.h"\
+	"..\..\..\libyasm\dbgfmt.h"\
+	"..\..\..\libyasm\errwarn.h"\
+	"..\..\..\libyasm\expr.h"\
+	"..\..\..\libyasm\file.h"\
+	"..\..\..\libyasm\floatnum.h"\
+	"..\..\..\libyasm\hamt.h"\
+	"..\..\..\libyasm\intnum.h"\
+	"..\..\..\libyasm\linemgr.h"\
+	"..\..\..\libyasm\objfmt.h"\
+	"..\..\..\libyasm\optimizer.h"\
+	"..\..\..\libyasm\preproc.h"\
+	"..\..\..\libyasm\section.h"\
+	"..\..\..\libyasm\symrec.h"\
+	"..\..\..\libyasm\valparam.h"\
+	"..\libyasm\config.h"\
+	
--- a/Mkfiles/vc/modules/modules.dsp
+++ b/Mkfiles/vc/modules/modules.dsp
@ -0,0 +1,244 @@
+# Microsoft Developer Studio Project File - Name="modules" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=modules - Win32 Debug
+!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 "modules.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 "modules.mak" CFG="modules - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "modules - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "modules - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "modules - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I ".." /I "../../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "modules - 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 Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ  /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "../../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "modules - Win32 Release"
+# Name "modules - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Group "arch"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\modules\arch\x86\x86arch.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\modules\arch\x86\x86arch.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\modules\arch\x86\x86bc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\modules\arch\x86\x86expr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\x86id.c
+# End Source File
+# End Group
+# Begin Group "dbgfmts"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\..\modules\dbgfmts\null\null-dbgfmt.c"
+# End Source File
+# End Group
+# Begin Group "objfmts"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\..\modules\objfmts\bin\bin-objfmt.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\modules\objfmts\coff\coff-objfmt.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\modules\objfmts\dbg\dbg-objfmt.c"
+# End Source File
+# End Group
+# Begin Group "optimizers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\..\modules\optimizers\basic\basic-optimizer.c"
+# End Source File
+# End Group
+# Begin Group "parsers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\..\nasm-bison.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\nasm-bison.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\modules\parsers\nasm\nasm-defs.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\modules\parsers\nasm\nasm-parser.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\modules\parsers\nasm\nasm-parser.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\nasm-token.c"
+# End Source File
+# End Group
+# Begin Group "preprocs"
+
+# PROP Default_Filter ""
+# Begin Group "nasm"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\..\modules\preprocs\nasm\nasm-eval.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\modules\preprocs\nasm\nasm-eval.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\nasm-macros.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\modules\preprocs\nasm\nasm-pp.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\modules\preprocs\nasm\nasm-pp.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\modules\preprocs\nasm\nasm-preproc.c"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\modules\preprocs\nasm\nasm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\modules\preprocs\nasm\nasmlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\modules\preprocs\nasm\nasmlib.h
+# End Source File
+# End Group
+# Begin Group "yapp"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\..\modules\preprocs\yapp\yapp-preproc.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\modules\preprocs\yapp\yapp-preproc.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\yapp-token.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\..\modules\preprocs\yapp\yapp-token.h"
+# End Source File
+# End Group
+# Begin Group "raw"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE="..\..\..\modules\preprocs\raw\raw-preproc.c"
+# End Source File
+# End Group
+# End Group
+# End Group
+# End Target
+# End Project
--- a/Mkfiles/vc/modules/modules.mak
+++ b/Mkfiles/vc/modules/modules.mak
@ -0,0 +1,424 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on modules.dsp
+!IF "$(CFG)" == ""
+CFG=modules - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to modules - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "modules - Win32 Release" && "$(CFG)" != "modules - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!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 "modules.mak" CFG="modules - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "modules - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "modules - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "modules - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\modules.lib"
+
+!ELSE 
+
+ALL : "libyasm - Win32 Release" "$(OUTDIR)\modules.lib"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libyasm - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\basic-optimizer.obj"
+	-@erase "$(INTDIR)\bin-objfmt.obj"
+	-@erase "$(INTDIR)\coff-objfmt.obj"
+	-@erase "$(INTDIR)\dbg-objfmt.obj"
+	-@erase "$(INTDIR)\nasm-bison.obj"
+	-@erase "$(INTDIR)\nasm-eval.obj"
+	-@erase "$(INTDIR)\nasm-macros.obj"
+	-@erase "$(INTDIR)\nasm-parser.obj"
+	-@erase "$(INTDIR)\nasm-pp.obj"
+	-@erase "$(INTDIR)\nasm-preproc.obj"
+	-@erase "$(INTDIR)\nasm-token.obj"
+	-@erase "$(INTDIR)\nasmlib.obj"
+	-@erase "$(INTDIR)\null-dbgfmt.obj"
+	-@erase "$(INTDIR)\raw-preproc.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\x86arch.obj"
+	-@erase "$(INTDIR)\x86bc.obj"
+	-@erase "$(INTDIR)\x86expr.obj"
+	-@erase "$(INTDIR)\x86id.obj"
+	-@erase "$(INTDIR)\yapp-preproc.obj"
+	-@erase "$(INTDIR)\yapp-token.obj"
+	-@erase "$(OUTDIR)\modules.lib"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I ".." /I "../../.." /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\modules.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\modules.bsc" 
+BSC32_SBRS= \
+	
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\modules.lib" 
+LIB32_OBJS= \
+	"$(INTDIR)\x86arch.obj" \
+	"$(INTDIR)\x86bc.obj" \
+	"$(INTDIR)\x86expr.obj" \
+	"$(INTDIR)\x86id.obj" \
+	"$(INTDIR)\null-dbgfmt.obj" \
+	"$(INTDIR)\bin-objfmt.obj" \
+	"$(INTDIR)\coff-objfmt.obj" \
+	"$(INTDIR)\dbg-objfmt.obj" \
+	"$(INTDIR)\basic-optimizer.obj" \
+	"$(INTDIR)\nasm-bison.obj" \
+	"$(INTDIR)\nasm-parser.obj" \
+	"$(INTDIR)\nasm-token.obj" \
+	"$(INTDIR)\nasm-eval.obj" \
+	"$(INTDIR)\nasm-macros.obj" \
+	"$(INTDIR)\nasm-pp.obj" \
+	"$(INTDIR)\nasm-preproc.obj" \
+	"$(INTDIR)\nasmlib.obj" \
+	"$(INTDIR)\yapp-preproc.obj" \
+	"$(INTDIR)\yapp-token.obj" \
+	"$(INTDIR)\raw-preproc.obj" \
+	"..\libyasm\Release\libyasm.lib"
+
+"$(OUTDIR)\modules.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "modules - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\modules.lib"
+
+!ELSE 
+
+ALL : "libyasm - Win32 Debug" "$(OUTDIR)\modules.lib"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libyasm - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\basic-optimizer.obj"
+	-@erase "$(INTDIR)\bin-objfmt.obj"
+	-@erase "$(INTDIR)\coff-objfmt.obj"
+	-@erase "$(INTDIR)\dbg-objfmt.obj"
+	-@erase "$(INTDIR)\nasm-bison.obj"
+	-@erase "$(INTDIR)\nasm-eval.obj"
+	-@erase "$(INTDIR)\nasm-macros.obj"
+	-@erase "$(INTDIR)\nasm-parser.obj"
+	-@erase "$(INTDIR)\nasm-pp.obj"
+	-@erase "$(INTDIR)\nasm-preproc.obj"
+	-@erase "$(INTDIR)\nasm-token.obj"
+	-@erase "$(INTDIR)\nasmlib.obj"
+	-@erase "$(INTDIR)\null-dbgfmt.obj"
+	-@erase "$(INTDIR)\raw-preproc.obj"
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\x86arch.obj"
+	-@erase "$(INTDIR)\x86bc.obj"
+	-@erase "$(INTDIR)\x86expr.obj"
+	-@erase "$(INTDIR)\x86id.obj"
+	-@erase "$(INTDIR)\yapp-preproc.obj"
+	-@erase "$(INTDIR)\yapp-token.obj"
+	-@erase "$(OUTDIR)\modules.lib"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I ".." /I "../../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\modules.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\modules.bsc" 
+BSC32_SBRS= \
+	
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\modules.lib" 
+LIB32_OBJS= \
+	"$(INTDIR)\x86arch.obj" \
+	"$(INTDIR)\x86bc.obj" \
+	"$(INTDIR)\x86expr.obj" \
+	"$(INTDIR)\x86id.obj" \
+	"$(INTDIR)\null-dbgfmt.obj" \
+	"$(INTDIR)\bin-objfmt.obj" \
+	"$(INTDIR)\coff-objfmt.obj" \
+	"$(INTDIR)\dbg-objfmt.obj" \
+	"$(INTDIR)\basic-optimizer.obj" \
+	"$(INTDIR)\nasm-bison.obj" \
+	"$(INTDIR)\nasm-parser.obj" \
+	"$(INTDIR)\nasm-token.obj" \
+	"$(INTDIR)\nasm-eval.obj" \
+	"$(INTDIR)\nasm-macros.obj" \
+	"$(INTDIR)\nasm-pp.obj" \
+	"$(INTDIR)\nasm-preproc.obj" \
+	"$(INTDIR)\nasmlib.obj" \
+	"$(INTDIR)\yapp-preproc.obj" \
+	"$(INTDIR)\yapp-token.obj" \
+	"$(INTDIR)\raw-preproc.obj" \
+	"..\libyasm\Debug\libyasm.lib"
+
+"$(OUTDIR)\modules.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+    $(LIB32) @<<
+  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("modules.dep")
+!INCLUDE "modules.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "modules.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "modules - Win32 Release" || "$(CFG)" == "modules - Win32 Debug"
+SOURCE=..\..\..\modules\arch\x86\x86arch.c
+
+"$(INTDIR)\x86arch.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\modules\arch\x86\x86bc.c
+
+"$(INTDIR)\x86bc.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\modules\arch\x86\x86expr.c
+
+"$(INTDIR)\x86expr.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\x86id.c
+
+"$(INTDIR)\x86id.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\modules\dbgfmts\null\null-dbgfmt.c"
+
+"$(INTDIR)\null-dbgfmt.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\modules\objfmts\bin\bin-objfmt.c"
+
+"$(INTDIR)\bin-objfmt.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\modules\objfmts\coff\coff-objfmt.c"
+
+"$(INTDIR)\coff-objfmt.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\modules\objfmts\dbg\dbg-objfmt.c"
+
+"$(INTDIR)\dbg-objfmt.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\modules\optimizers\basic\basic-optimizer.c"
+
+"$(INTDIR)\basic-optimizer.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\nasm-bison.c"
+
+"$(INTDIR)\nasm-bison.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\modules\parsers\nasm\nasm-parser.c"
+
+"$(INTDIR)\nasm-parser.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\nasm-token.c"
+
+"$(INTDIR)\nasm-token.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\modules\preprocs\nasm\nasm-eval.c"
+
+"$(INTDIR)\nasm-eval.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\nasm-macros.c"
+
+"$(INTDIR)\nasm-macros.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\modules\preprocs\nasm\nasm-pp.c"
+
+"$(INTDIR)\nasm-pp.obj" : $(SOURCE) "$(INTDIR)" "..\..\..\nasm-macros.c"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\modules\preprocs\nasm\nasm-preproc.c"
+
+"$(INTDIR)\nasm-preproc.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\..\modules\preprocs\nasm\nasmlib.c
+
+"$(INTDIR)\nasmlib.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\modules\preprocs\yapp\yapp-preproc.c"
+
+"$(INTDIR)\yapp-preproc.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\yapp-token.c"
+
+"$(INTDIR)\yapp-token.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE="..\..\..\modules\preprocs\raw\raw-preproc.c"
+
+"$(INTDIR)\raw-preproc.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!IF  "$(CFG)" == "modules - Win32 Release"
+
+"libyasm - Win32 Release" : 
+   cd "\cygwin\home\Pete\yasm\yasm\Mkfiles\vc\libyasm"
+   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Release" 
+   cd "..\modules"
+
+"libyasm - Win32 ReleaseCLEAN" : 
+   cd "\cygwin\home\Pete\yasm\yasm\Mkfiles\vc\libyasm"
+   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Release" RECURSE=1 CLEAN 
+   cd "..\modules"
+
+!ELSEIF  "$(CFG)" == "modules - Win32 Debug"
+
+"libyasm - Win32 Debug" : 
+   cd "\cygwin\home\Pete\yasm\yasm\Mkfiles\vc\libyasm"
+   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Debug" 
+   cd "..\modules"
+
+"libyasm - Win32 DebugCLEAN" : 
+   cd "\cygwin\home\Pete\yasm\yasm\Mkfiles\vc\libyasm"
+   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Debug" RECURSE=1 CLEAN 
+   cd "..\modules"
+
+!ENDIF 
+
+
+!ENDIF 
+
--- a/Mkfiles/vc/yasm-module.c
+++ b/Mkfiles/vc/yasm-module.c
@ -0,0 +1,127 @@
+/*
+ * YASM module loader for Win32
+ *
+ *  Copyright (C) 2003  Peter Johnson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#define YASM_LIB_INTERNAL
+#include "libyasm.h"
+/*@unused@*/ RCSID("$IdPath$");
+
+#include "yasm-module.h"
+
+
+typedef struct module {
+    const char *keyword;	    /* module keyword */
+    const char *symbol;		    /* module symbol */
+    void *data;			    /* associated data */
+} module;
+
+extern yasm_arch yasm_x86_LTX_arch;
+extern int yasm_x86_LTX_mode_bits;
+extern yasm_dbgfmt yasm_null_LTX_dbgfmt;
+extern yasm_objfmt yasm_bin_LTX_objfmt;
+extern yasm_objfmt yasm_coff_LTX_objfmt;
+extern yasm_objfmt yasm_dbg_LTX_objfmt;
+extern yasm_optimizer yasm_basic_LTX_optimizer;
+extern yasm_parser yasm_nasm_LTX_parser;
+extern yasm_preproc yasm_nasm_LTX_preproc;
+extern yasm_preproc yasm_raw_LTX_preproc;
+extern yasm_preproc yasm_yapp_LTX_preproc;
+
+static module modules[] = {
+    {"x86", "arch", &yasm_x86_LTX_arch},
+    {"x86", "mode_bits", &yasm_x86_LTX_mode_bits},
+    {"null", "dbgfmt", &yasm_null_LTX_dbgfmt},
+    {"bin",  "objfmt", &yasm_bin_LTX_objfmt},
+    {"coff", "objfmt", &yasm_coff_LTX_objfmt},
+    {"dbg", "objfmt", &yasm_dbg_LTX_objfmt},
+    {"basic", "optimizer", &yasm_basic_LTX_optimizer},
+    {"nasm", "parser", &yasm_nasm_LTX_parser},
+    {"nasm", "preproc", &yasm_nasm_LTX_preproc},
+    {"raw", "preproc", &yasm_raw_LTX_preproc},
+    {"yapp", "preproc", &yasm_yapp_LTX_preproc},
+};
+
+
+static /*@dependent@*/ /*@null@*/ module *
+load_module(const char *keyword)
+{
+    int i;
+
+    /* Look for the module. */
+    for (i=0; i<sizeof(modules)/sizeof(modules[0]); i++) {
+	if (yasm__strcasecmp(modules[i].keyword, keyword) == 0)
+	    return &modules[i];
+    }
+
+    return NULL;
+}
+
+void
+unload_modules(void)
+{
+}
+
+void *
+get_module_data(const char *keyword, const char *symbol)
+{
+    int i;
+
+    /* Look for the module/symbol. */
+    for (i=0; i<sizeof(modules)/sizeof(modules[0]); i++) {
+	if (yasm__strcasecmp(modules[i].keyword, keyword) == 0 &&
+	    strcmp(modules[i].symbol, symbol) == 0)
+	    return modules[i].data;
+    }
+
+    return NULL;
+}
+
+void
+list_objfmts(void (*printfunc) (const char *name, const char *keyword))
+{
+    int i;
+
+    /* Go through available list, and try to load each one */
+    for (i=0; i<sizeof(modules)/sizeof(modules[0]); i++) {
+	if (strcmp(modules[i].symbol, "objfmt") == 0) {
+	    yasm_objfmt *of = modules[i].data;
+	    printfunc(of->name, of->keyword);
+	}
+    }
+}
+
+void
+list_parsers(void (*printfunc) (const char *name, const char *keyword))
+{
+    int i;
+
+    /* Go through available list, and try to load each one */
+    for (i=0; i<sizeof(modules)/sizeof(modules[0]); i++) {
+	if (strcmp(modules[i].symbol, "parser") == 0) {
+	    yasm_parser *p = modules[i].data;
+	    printfunc(p->name, p->keyword);
+	}
+    }
+}
--- a/Mkfiles/vc/yasm.dep
+++ b/Mkfiles/vc/yasm.dep
@ -0,0 +1,504 @@
+# Microsoft Developer Studio Generated Dependency File, included by yasm.mak
+
+..\..\src\arch\x86\x86arch.c : \
+	"..\..\src\arch.h"\
+	"..\..\src\arch\x86\x86arch.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\file.h"\
+	"..\..\src\floatnum.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\arch\x86\x86bc.c : \
+	"..\..\src\arch.h"\
+	"..\..\src\arch\x86\x86arch.h"\
+	"..\..\src\bc-int.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\file.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\arch\x86\x86expr.c : \
+	"..\..\src\arch.h"\
+	"..\..\src\arch\x86\x86arch.h"\
+	"..\..\src\bitvect.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr-int.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\floatnum.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\src\dbgfmts\null\null-dbgfmt.c" : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\dbgfmt.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\src\objfmts\bin\bin-objfmt.c" : \
+	"..\..\src\arch.h"\
+	"..\..\src\bc-int.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr-int.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\file.h"\
+	"..\..\src\floatnum.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\objfmt.h"\
+	"..\..\src\section.h"\
+	"..\..\src\symrec.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\src\objfmts\coff\coff-objfmt.c" : \
+	"..\..\src\arch.h"\
+	"..\..\src\bc-int.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr-int.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\file.h"\
+	"..\..\src\floatnum.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\objfmt.h"\
+	"..\..\src\section.h"\
+	"..\..\src\symrec.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\src\objfmts\dbg\dbg-objfmt.c" : \
+	"..\..\src\arch.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\dbgfmt.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\objfmt.h"\
+	"..\..\src\section.h"\
+	"..\..\src\symrec.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\src\optimizers\basic\basic-optimizer.c" : \
+	"..\..\src\bc-int.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\optimizer.h"\
+	"..\..\src\section.h"\
+	"..\..\src\symrec.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\src\parsers\nasm\nasm-parser.c" : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\objfmt.h"\
+	"..\..\src\parsers\nasm\nasm-parser.h"\
+	"..\..\src\preproc.h"\
+	"..\..\src\section.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\src\preprocs\nasm\nasm-eval.c" : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\preprocs\nasm\nasm-eval.h"\
+	"..\..\src\preprocs\nasm\nasm.h"\
+	"..\..\src\preprocs\nasm\nasmlib.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\src\preprocs\nasm\nasm-pp.c" : \
+	"..\..\nasm-macros.c"\
+	"..\..\src\preprocs\nasm\nasm-pp.h"\
+	"..\..\src\preprocs\nasm\nasm.h"\
+	"..\..\src\preprocs\nasm\nasmlib.h"\
+	"..\..\src\valparam.h"\
+	
+
+"..\..\src\preprocs\nasm\nasm-preproc.c" : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\linemgr.h"\
+	"..\..\src\preproc.h"\
+	"..\..\src\preprocs\nasm\nasm-eval.h"\
+	"..\..\src\preprocs\nasm\nasm-pp.h"\
+	"..\..\src\preprocs\nasm\nasm.h"\
+	"..\..\src\preprocs\nasm\nasmlib.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\preprocs\nasm\nasmlib.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\preprocs\nasm\nasm.h"\
+	"..\..\src\preprocs\nasm\nasmlib.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\src\preprocs\raw\raw-preproc.c" : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\linemgr.h"\
+	"..\..\src\preproc.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\src\preprocs\yapp\yapp-preproc.c" : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\hamt.h"\
+	"..\..\src\linemgr.h"\
+	"..\..\src\preproc.h"\
+	"..\..\src\preprocs\yapp\yapp-preproc.h"\
+	"..\..\src\preprocs\yapp\yapp-token.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\nasm-bison.c" : \
+	"..\..\src\arch.h"\
+	"..\..\src\bitvect.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr-int.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\floatnum.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\linemgr.h"\
+	"..\..\src\objfmt.h"\
+	"..\..\src\parsers\nasm\nasm-defs.h"\
+	"..\..\src\parsers\nasm\nasm-parser.h"\
+	"..\..\src\section.h"\
+	"..\..\src\symrec.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\nasm-token.c" : \
+	"..\..\nasm-bison.h"\
+	"..\..\src\arch.h"\
+	"..\..\src\bitvect.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\floatnum.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\linemgr.h"\
+	"..\..\src\parsers\nasm\nasm-defs.h"\
+	"..\..\src\parsers\nasm\nasm-parser.h"\
+	"..\..\src\symrec.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\x86id.c : \
+	"..\..\src\arch.h"\
+	"..\..\src\arch\x86\x86arch.h"\
+	"..\..\src\bc-int.h"\
+	"..\..\src\bitvect.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr-int.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\floatnum.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\symrec.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+"..\..\yapp-token.c" : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\linemgr.h"\
+	"..\..\src\preprocs\yapp\yapp-preproc.h"\
+	"..\..\src\preprocs\yapp\yapp-token.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\arch.c : \
+	"..\..\src\arch.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\bitvect.c : \
+	"..\..\src\bitvect.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\bytecode.c : \
+	"..\..\src\arch.h"\
+	"..\..\src\bc-int.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr-int.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\file.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\objfmt.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\errwarn.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\linemgr.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\expr.c : \
+	"..\..\src\arch.h"\
+	"..\..\src\bitvect.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr-int.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\floatnum.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\section.h"\
+	"..\..\src\symrec.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\file.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\file.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\floatnum.c : \
+	"..\..\src\bitvect.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\file.h"\
+	"..\..\src\floatnum.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\hamt.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\hamt.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\intnum.c : \
+	"..\..\src\bitvect.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\file.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\linemgr.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\hamt.h"\
+	"..\..\src\linemgr.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\main.c : \
+	"..\..\src\arch.h"\
+	"..\..\src\bitvect.h"\
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\dbgfmt.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\file.h"\
+	"..\..\src\floatnum.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\linemgr.h"\
+	"..\..\src\module.h"\
+	"..\..\src\objfmt.h"\
+	"..\..\src\optimizer.h"\
+	"..\..\src\options.h"\
+	"..\..\src\preproc.h"\
+	"..\..\src\section.h"\
+	"..\..\src\symrec.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\mergesort.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+.\module.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\module.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\objfmt.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\module.h"\
+	"..\..\src\objfmt.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\options.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\options.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\parser.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\module.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\section.c : \
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\intnum.h"\
+	"..\..\src\objfmt.h"\
+	"..\..\src\section.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\strcasecmp.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\strsep.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\symrec.c : \
+	"..\..\src\bytecode.h"\
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\errwarn.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\floatnum.h"\
+	"..\..\src\hamt.h"\
+	"..\..\src\objfmt.h"\
+	"..\..\src\section.h"\
+	"..\..\src\symrec.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\valparam.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\expr.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\xmalloc.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
+
+..\..\src\xstrdup.c : \
+	"..\..\src\compat-queue.h"\
+	"..\..\src\coretype.h"\
+	"..\..\src\valparam.h"\
+	".\config.h"\
+	
--- a/Mkfiles/vc/yasm.dsp
+++ b/Mkfiles/vc/yasm.dsp
@ -0,0 +1,118 @@
+# Microsoft Developer Studio Project File - Name="yasm" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=yasm - Win32 Debug
+!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 "yasm.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 "yasm.mak" CFG="yasm - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "yasm - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "yasm - Win32 Debug" (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)" == "yasm - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "." /I "../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+
+!ELSEIF  "$(CFG)" == "yasm - 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" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "../.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "yasm - Win32 Release"
+# Name "yasm - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=".\yasm-module.c"
+# ADD CPP /I "../../frontends/yasm"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\frontends\yasm\yasm-module.h"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\frontends\yasm\yasm-options.c"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\frontends\yasm\yasm-options.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\frontends\yasm\yasm.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
--- a/Mkfiles/vc/yasm.dsw
+++ b/Mkfiles/vc/yasm.dsw
@ -0,0 +1,62 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "libyasm"=.\libyasm\libyasm.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "modules"=.\modules\modules.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libyasm
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "yasm"=.\yasm.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name libyasm
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name modules
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
--- a/Mkfiles/vc/yasm.mak
+++ b/Mkfiles/vc/yasm.mak
@ -0,0 +1,302 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on yasm.dsp
+!IF "$(CFG)" == ""
+CFG=yasm - Win32 Debug
+!MESSAGE No configuration specified. Defaulting to yasm - Win32 Debug.
+!ENDIF 
+
+!IF "$(CFG)" != "yasm - Win32 Release" && "$(CFG)" != "yasm - Win32 Debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!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 "yasm.mak" CFG="yasm - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "yasm - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "yasm - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+!ERROR An invalid configuration is specified.
+!ENDIF 
+
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE 
+NULL=nul
+!ENDIF 
+
+!IF  "$(CFG)" == "yasm - Win32 Release"
+
+OUTDIR=.\Release
+INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\yasm.exe"
+
+!ELSE 
+
+ALL : "modules - Win32 Release" "libyasm - Win32 Release" "$(OUTDIR)\yasm.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libyasm - Win32 ReleaseCLEAN" "modules - Win32 ReleaseCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\yasm-module.obj"
+	-@erase "$(INTDIR)\yasm-options.obj"
+	-@erase "$(INTDIR)\yasm.obj"
+	-@erase "$(OUTDIR)\yasm.exe"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "." /I "../.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\yasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\yasm.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\yasm.pdb" /machine:I386 /out:"$(OUTDIR)\yasm.exe" 
+LINK32_OBJS= \
+	"$(INTDIR)\yasm-module.obj" \
+	"$(INTDIR)\yasm-options.obj" \
+	"$(INTDIR)\yasm.obj" \
+	".\libyasm\Release\libyasm.lib" \
+	".\modules\Release\modules.lib"
+
+"$(OUTDIR)\yasm.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ELSEIF  "$(CFG)" == "yasm - Win32 Debug"
+
+OUTDIR=.\Debug
+INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0" 
+
+ALL : "$(OUTDIR)\yasm.exe"
+
+!ELSE 
+
+ALL : "modules - Win32 Debug" "libyasm - Win32 Debug" "$(OUTDIR)\yasm.exe"
+
+!ENDIF 
+
+!IF "$(RECURSE)" == "1" 
+CLEAN :"libyasm - Win32 DebugCLEAN" "modules - Win32 DebugCLEAN" 
+!ELSE 
+CLEAN :
+!ENDIF 
+	-@erase "$(INTDIR)\vc60.idb"
+	-@erase "$(INTDIR)\vc60.pdb"
+	-@erase "$(INTDIR)\yasm-module.obj"
+	-@erase "$(INTDIR)\yasm-options.obj"
+	-@erase "$(INTDIR)\yasm.obj"
+	-@erase "$(OUTDIR)\yasm.exe"
+	-@erase "$(OUTDIR)\yasm.ilk"
+	-@erase "$(OUTDIR)\yasm.pdb"
+
+"$(OUTDIR)" :
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP=cl.exe
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "." /I "../.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\yasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+.c{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.obj::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.c{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cpp{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+.cxx{$(INTDIR)}.sbr::
+   $(CPP) @<<
+   $(CPP_PROJ) $< 
+<<
+
+RSC=rc.exe
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\yasm.bsc" 
+BSC32_SBRS= \
+	
+LINK32=link.exe
+LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\yasm.pdb" /debug /machine:I386 /out:"$(OUTDIR)\yasm.exe" /pdbtype:sept 
+LINK32_OBJS= \
+	"$(INTDIR)\yasm-module.obj" \
+	"$(INTDIR)\yasm-options.obj" \
+	"$(INTDIR)\yasm.obj" \
+	".\libyasm\Debug\libyasm.lib" \
+	".\modules\Debug\modules.lib"
+
+"$(OUTDIR)\yasm.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+    $(LINK32) @<<
+  $(LINK32_FLAGS) $(LINK32_OBJS)
+<<
+
+!ENDIF 
+
+
+!IF "$(NO_EXTERNAL_DEPS)" != "1"
+!IF EXISTS("yasm.dep")
+!INCLUDE "yasm.dep"
+!ELSE 
+!MESSAGE Warning: cannot find "yasm.dep"
+!ENDIF 
+!ENDIF 
+
+
+!IF "$(CFG)" == "yasm - Win32 Release" || "$(CFG)" == "yasm - Win32 Debug"
+SOURCE=".\yasm-module.c"
+
+!IF  "$(CFG)" == "yasm - Win32 Release"
+
+CPP_SWITCHES=/nologo /ML /W3 /GX /O2 /I "." /I "../.." /I "../../frontends/yasm" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\yasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+
+"$(INTDIR)\yasm-module.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) @<<
+  $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ELSEIF  "$(CFG)" == "yasm - Win32 Debug"
+
+CPP_SWITCHES=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "../../frontends/yasm" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\yasm.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
+
+"$(INTDIR)\yasm-module.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) @<<
+  $(CPP_SWITCHES) $(SOURCE)
+<<
+
+
+!ENDIF 
+
+SOURCE="..\..\frontends\yasm\yasm-options.c"
+
+"$(INTDIR)\yasm-options.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+SOURCE=..\..\frontends\yasm\yasm.c
+
+"$(INTDIR)\yasm.obj" : $(SOURCE) "$(INTDIR)"
+	$(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!IF  "$(CFG)" == "yasm - Win32 Release"
+
+"libyasm - Win32 Release" : 
+   cd ".\libyasm"
+   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Release" 
+   cd ".."
+
+"libyasm - Win32 ReleaseCLEAN" : 
+   cd ".\libyasm"
+   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Release" RECURSE=1 CLEAN 
+   cd ".."
+
+!ELSEIF  "$(CFG)" == "yasm - Win32 Debug"
+
+"libyasm - Win32 Debug" : 
+   cd ".\libyasm"
+   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Debug" 
+   cd ".."
+
+"libyasm - Win32 DebugCLEAN" : 
+   cd ".\libyasm"
+   $(MAKE) /$(MAKEFLAGS) /F .\libyasm.mak CFG="libyasm - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".."
+
+!ENDIF 
+
+!IF  "$(CFG)" == "yasm - Win32 Release"
+
+"modules - Win32 Release" : 
+   cd ".\modules"
+   $(MAKE) /$(MAKEFLAGS) /F .\modules.mak CFG="modules - Win32 Release" 
+   cd ".."
+
+"modules - Win32 ReleaseCLEAN" : 
+   cd ".\modules"
+   $(MAKE) /$(MAKEFLAGS) /F .\modules.mak CFG="modules - Win32 Release" RECURSE=1 CLEAN 
+   cd ".."
+
+!ELSEIF  "$(CFG)" == "yasm - Win32 Debug"
+
+"modules - Win32 Debug" : 
+   cd ".\modules"
+   $(MAKE) /$(MAKEFLAGS) /F .\modules.mak CFG="modules - Win32 Debug" 
+   cd ".."
+
+"modules - Win32 DebugCLEAN" : 
+   cd ".\modules"
+   $(MAKE) /$(MAKEFLAGS) /F .\modules.mak CFG="modules - Win32 Debug" RECURSE=1 CLEAN 
+   cd ".."
+
+!ENDIF 
+
+
+!ENDIF 
+