From 6caf1518939d41627f7d6bb220650f4ce77cd087 Mon Sep 17 00:00:00 2001 From: Brian Gladman Date: Tue, 7 Mar 2017 20:38:37 +0000 Subject: add Visual Studio 2017 build files --- Mkfiles/vc15/config.h | 170 +++++++++++ Mkfiles/vc15/crt_secure_no_deprecate.props | 11 + Mkfiles/vc15/crt_secure_no_deprecate.vsprops | 11 + Mkfiles/vc15/genmacro/genmacro.vcxproj | 202 +++++++++++++ Mkfiles/vc15/genmacro/genmacro.vcxproj.filters | 17 ++ Mkfiles/vc15/genmacro/run.bat | 5 + Mkfiles/vc15/genmodule/genmodule.vcxproj | 207 +++++++++++++ Mkfiles/vc15/genmodule/genmodule.vcxproj.filters | 20 ++ Mkfiles/vc15/genmodule/run.bat | 3 + Mkfiles/vc15/genperf/genperf.vcxproj | 261 +++++++++++++++++ Mkfiles/vc15/genperf/genperf.vcxproj.filters | 56 ++++ Mkfiles/vc15/genperf/run.bat | 40 +++ Mkfiles/vc15/genstring/genstring.vcxproj | 196 +++++++++++++ Mkfiles/vc15/genstring/genstring.vcxproj.filters | 17 ++ Mkfiles/vc15/genstring/run.bat | 2 + Mkfiles/vc15/genversion/genversion.vcxproj | 223 ++++++++++++++ Mkfiles/vc15/genversion/genversion.vcxproj.filters | 26 ++ Mkfiles/vc15/genversion/run.bat | 2 + Mkfiles/vc15/genversion/runpre.bat | 2 + Mkfiles/vc15/libyasm-stdint.h | 8 + Mkfiles/vc15/libyasm/libyasm.vcxproj | 277 ++++++++++++++++++ Mkfiles/vc15/libyasm/libyasm.vcxproj.filters | 200 +++++++++++++ Mkfiles/vc15/modules/modules.vcxproj | 324 +++++++++++++++++++++ Mkfiles/vc15/modules/modules.vcxproj.filters | 256 ++++++++++++++++ Mkfiles/vc15/out_copy_rename.bat | 42 +++ Mkfiles/vc15/re2c/re2c.vcxproj | 221 ++++++++++++++ Mkfiles/vc15/re2c/re2c.vcxproj.filters | 80 +++++ Mkfiles/vc15/re2c/run.bat | 4 + Mkfiles/vc15/readme.vc14.txt | 106 +++++++ Mkfiles/vc15/vsyasm.props | 27 ++ Mkfiles/vc15/vsyasm.targets | 108 +++++++ Mkfiles/vc15/vsyasm.vcxproj | 279 ++++++++++++++++++ Mkfiles/vc15/vsyasm.xml | 283 ++++++++++++++++++ Mkfiles/vc15/yasm.sln | 142 +++++++++ Mkfiles/vc15/yasm.vcxproj | 283 ++++++++++++++++++ Mkfiles/vc15/yasm.vcxproj.filters | 41 +++ Mkfiles/vc15/ytasm.vcxproj | 278 ++++++++++++++++++ 37 files changed, 4430 insertions(+) create mode 100644 Mkfiles/vc15/config.h create mode 100644 Mkfiles/vc15/crt_secure_no_deprecate.props create mode 100644 Mkfiles/vc15/crt_secure_no_deprecate.vsprops create mode 100644 Mkfiles/vc15/genmacro/genmacro.vcxproj create mode 100644 Mkfiles/vc15/genmacro/genmacro.vcxproj.filters create mode 100644 Mkfiles/vc15/genmacro/run.bat create mode 100644 Mkfiles/vc15/genmodule/genmodule.vcxproj create mode 100644 Mkfiles/vc15/genmodule/genmodule.vcxproj.filters create mode 100644 Mkfiles/vc15/genmodule/run.bat create mode 100644 Mkfiles/vc15/genperf/genperf.vcxproj create mode 100644 Mkfiles/vc15/genperf/genperf.vcxproj.filters create mode 100644 Mkfiles/vc15/genperf/run.bat create mode 100644 Mkfiles/vc15/genstring/genstring.vcxproj create mode 100644 Mkfiles/vc15/genstring/genstring.vcxproj.filters create mode 100644 Mkfiles/vc15/genstring/run.bat create mode 100644 Mkfiles/vc15/genversion/genversion.vcxproj create mode 100644 Mkfiles/vc15/genversion/genversion.vcxproj.filters create mode 100644 Mkfiles/vc15/genversion/run.bat create mode 100644 Mkfiles/vc15/genversion/runpre.bat create mode 100644 Mkfiles/vc15/libyasm-stdint.h create mode 100644 Mkfiles/vc15/libyasm/libyasm.vcxproj create mode 100644 Mkfiles/vc15/libyasm/libyasm.vcxproj.filters create mode 100644 Mkfiles/vc15/modules/modules.vcxproj create mode 100644 Mkfiles/vc15/modules/modules.vcxproj.filters create mode 100644 Mkfiles/vc15/out_copy_rename.bat create mode 100644 Mkfiles/vc15/re2c/re2c.vcxproj create mode 100644 Mkfiles/vc15/re2c/re2c.vcxproj.filters create mode 100644 Mkfiles/vc15/re2c/run.bat create mode 100644 Mkfiles/vc15/readme.vc14.txt create mode 100644 Mkfiles/vc15/vsyasm.props create mode 100644 Mkfiles/vc15/vsyasm.targets create mode 100644 Mkfiles/vc15/vsyasm.vcxproj create mode 100644 Mkfiles/vc15/vsyasm.xml create mode 100644 Mkfiles/vc15/yasm.sln create mode 100644 Mkfiles/vc15/yasm.vcxproj create mode 100644 Mkfiles/vc15/yasm.vcxproj.filters create mode 100644 Mkfiles/vc15/ytasm.vcxproj diff --git a/Mkfiles/vc15/config.h b/Mkfiles/vc15/config.h new file mode 100644 index 00000000..8515ac5a --- /dev/null +++ b/Mkfiles/vc15/config.h @@ -0,0 +1,170 @@ +#include "YASM-VERSION.h" +#define yasm__splitpath(path, tail) yasm__splitpath_win(path, tail) +#define yasm__abspath(path) yasm__abspath_win(path) +#define yasm__combpath(from, to) yasm__combpath_win(from, to) + +/* Command name to run C preprocessor */ +#define CPP_PROG "cpp" + +/* */ +/* #undef ENABLE_NLS */ + +/* Define if you have the `abort' function. */ +#define HAVE_ABORT 1 + +/* */ +/* #undef HAVE_CATGETS */ + +/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DIRECT_H 1 + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* */ +/* #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 if you have the header file. */ +/* #undef HAVE_INTTYPES_H */ + +/* */ +/* #undef HAVE_LC_MESSAGES */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBGEN_H */ + +/* Define if you have the header file. */ +/* #undef HAVE_MEMORY_H */ + +/* Define if you have the `mergesort' function. */ +/* #undef HAVE_MERGESORT */ + +/* Define to 1 if you have the `popen' function. */ +/* #undef HAVE_POPEN */ + +/* Define if you have the header file. */ +/* #undef HAVE_STDINT_H */ + +/* Define if you have the 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 `strcmpi' function. */ +/* #undef HAVE_STRCMPI */ + +/* Define if you have the `stricmp' function. */ +/* #undefine HAVE_STRICMP */ + +/* Define if you have the header file. */ +/* #undef HAVE_STRINGS_H */ + +/* Define if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define if you have the `strncasecmp' function. */ +/* #undef HAVE_STRNCASECMP */ + +/* Define if you have the `strsep' function. */ +/* #undef HAVE_STRSEP */ + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_STAT_H */ + +/* Define if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the `toascii' function. */ +#define HAVE_TOASCII 1 +#define toascii __toascii + +/* Define if you have the header file. */ +/* #undef HAVE_UNISTD_H */ + +/* Define to 1 if you have the `vsnprintf' function. */ +/* #undef HAVE_VSNPRINTF */ + +/* Define to 1 if you have the `_stricmp' function. */ +#define HAVE__STRICMP 1 + +/* 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 HEAD"*/ + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "yasm" + +/* Define to the version of this package. */ +/*#define PACKAGE_VERSION "HEAD"*/ + +/* Define if the C compiler supports function prototypes. */ +#define PROTOTYPES 1 + +/* The size of a `char', as computed by sizeof. */ +/* #undef SIZEOF_CHAR */ + +/* The size of a `int', as computed by sizeof. */ +/* #undef SIZEOF_INT */ + +/* The size of a `long', as computed by sizeof. */ +/* #undef SIZEOF_LONG */ + +/* The size of a `short', as computed by sizeof. */ +/* #undef SIZEOF_SHORT */ + +/* The size of a `void*', as computed by sizeof. */ +/* #undef SIZEOF_VOIDP */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "HEAD" + +/* Define if using the dmalloc debugging malloc package */ +/* #undef WITH_DMALLOC */ + +/* 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 as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to `unsigned' if doesn't define. */ +/* #undef size_t */ diff --git a/Mkfiles/vc15/crt_secure_no_deprecate.props b/Mkfiles/vc15/crt_secure_no_deprecate.props new file mode 100644 index 00000000..777d6d0a --- /dev/null +++ b/Mkfiles/vc15/crt_secure_no_deprecate.props @@ -0,0 +1,11 @@ + + + + <_ProjectFileVersion>10.0.21006.1 + + + + _CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + + + \ No newline at end of file diff --git a/Mkfiles/vc15/crt_secure_no_deprecate.vsprops b/Mkfiles/vc15/crt_secure_no_deprecate.vsprops new file mode 100644 index 00000000..56ab506f --- /dev/null +++ b/Mkfiles/vc15/crt_secure_no_deprecate.vsprops @@ -0,0 +1,11 @@ + + + + diff --git a/Mkfiles/vc15/genmacro/genmacro.vcxproj b/Mkfiles/vc15/genmacro/genmacro.vcxproj new file mode 100644 index 00000000..794399a3 --- /dev/null +++ b/Mkfiles/vc15/genmacro/genmacro.vcxproj @@ -0,0 +1,202 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {225700A5-07B8-434E-AD61-555278BF6733} + genmacro + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + false + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + Level3 + ProgramDatabase + Default + + + $(OutDir)genmacro.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX86 + + + run.bat "$(TargetPath)" + + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + Level3 + ProgramDatabase + Default + + + $(OutDir)genmacro.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + + + run.bat "$(TargetPath)" + + + + + Full + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + Level3 + Default + + + $(OutDir)genmacro.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + MachineX86 + + + run.bat "$(TargetPath)" + + + + + Full + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + Level3 + Default + + + $(OutDir)genmacro.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + + + run.bat "$(TargetPath)" + + + + + + + + + + + {b545983b-8ee0-4a7b-a67a-e749eeae62a2} + false + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/genmacro/genmacro.vcxproj.filters b/Mkfiles/vc15/genmacro/genmacro.vcxproj.filters new file mode 100644 index 00000000..402cf1b4 --- /dev/null +++ b/Mkfiles/vc15/genmacro/genmacro.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/genmacro/run.bat b/Mkfiles/vc15/genmacro/run.bat new file mode 100644 index 00000000..98c337ac --- /dev/null +++ b/Mkfiles/vc15/genmacro/run.bat @@ -0,0 +1,5 @@ +cd ..\..\.. +%1 nasm-version.c nasm_version_mac version.mac +%1 nasm-macros.c nasm_standard_mac modules\parsers\nasm\nasm-std.mac +%1 win64-nasm.c win64_nasm_stdmac modules\objfmts\coff\win64-nasm.mac +%1 win64-gas.c win64_gas_stdmac modules\objfmts\coff\win64-gas.mac diff --git a/Mkfiles/vc15/genmodule/genmodule.vcxproj b/Mkfiles/vc15/genmodule/genmodule.vcxproj new file mode 100644 index 00000000..602115e2 --- /dev/null +++ b/Mkfiles/vc15/genmodule/genmodule.vcxproj @@ -0,0 +1,207 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {F0E8B707-00C5-4FF2-B8EF-7C39817132A0} + genmodule + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + false + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FILTERMODE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + $(IntDir) + Level3 + ProgramDatabase + Default + + + $(OutDir)genmodule.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX86 + + + run.bat "$(TargetPath)" + + + + + Disabled + %(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;FILTERMODE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + $(IntDir) + Level3 + ProgramDatabase + Default + + + $(OutDir)genmodule.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + + + run.bat "$(TargetPath)" + + + + + Full + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FILTERMODE;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + $(IntDir) + Level3 + Default + + + $(OutDir)genmodule.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + MachineX86 + + + run.bat "$(TargetPath)" + + + + + Full + %(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;FILTERMODE;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + $(IntDir) + Level3 + Default + + + $(OutDir)genmodule.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + + + run.bat "$(TargetPath)" + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/genmodule/genmodule.vcxproj.filters b/Mkfiles/vc15/genmodule/genmodule.vcxproj.filters new file mode 100644 index 00000000..d3255c29 --- /dev/null +++ b/Mkfiles/vc15/genmodule/genmodule.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/genmodule/run.bat b/Mkfiles/vc15/genmodule/run.bat new file mode 100644 index 00000000..00055692 --- /dev/null +++ b/Mkfiles/vc15/genmodule/run.bat @@ -0,0 +1,3 @@ +@echo off +cd ..\..\.. +%1 libyasm\module.in Makefile.am diff --git a/Mkfiles/vc15/genperf/genperf.vcxproj b/Mkfiles/vc15/genperf/genperf.vcxproj new file mode 100644 index 00000000..ad4e8aff --- /dev/null +++ b/Mkfiles/vc15/genperf/genperf.vcxproj @@ -0,0 +1,261 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619} + genperf + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + false + false + false + false + false + + + + + + + + Disabled + ..;../../..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;STDC_HEADERS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + Level3 + ProgramDatabase + Default + + + $(OutDir)genperf.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX86 + + + + + + + run.bat "$(TargetPath)" + + + x86insn_nasm.c;x86insn_gas.c;x86cpu.c;x86regtmod.c;%(Outputs) + + + run.bat "$(TargetPath)" + + + + + Disabled + ..;../../..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;STDC_HEADERS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + Level3 + ProgramDatabase + Default + + + $(OutDir)genperf.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + + + + + + + run.bat "$(TargetPath)" + + + x86insn_nasm.c;x86insn_gas.c;x86cpu.c;x86regtmod.c;%(Outputs) + + + run.bat "$(TargetPath)" + + + + + Full + ..;../../..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;STDC_HEADERS;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + Level3 + Default + + + $(OutDir)genperf.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + MachineX86 + + + + + + + run.bat "$(TargetPath)" + + + x86insn_nasm.c;x86insn_gas.c;x86cpu.c;x86regtmod.c;%(Outputs) + + + run.bat "$(TargetPath)" + + + + + Full + ..;../../..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;STDC_HEADERS;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + Level3 + Default + + + $(OutDir)genperf.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + + + + + + + run.bat "$(TargetPath)" + + + x86insn_nasm.c;x86insn_gas.c;x86cpu.c;x86regtmod.c;%(Outputs) + + + run.bat "$(TargetPath)" + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/genperf/genperf.vcxproj.filters b/Mkfiles/vc15/genperf/genperf.vcxproj.filters new file mode 100644 index 00000000..3124b5d7 --- /dev/null +++ b/Mkfiles/vc15/genperf/genperf.vcxproj.filters @@ -0,0 +1,56 @@ + + + + + {3C1E9AA8-6338-4CED-99F1-BEBA80607BD5} + h;hpp;hxx;hm;inl;inc;xsd + + + {1062695D-1C50-4068-8313-73A409885BC1} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/genperf/run.bat b/Mkfiles/vc15/genperf/run.bat new file mode 100644 index 00000000..c6f83543 --- /dev/null +++ b/Mkfiles/vc15/genperf/run.bat @@ -0,0 +1,40 @@ +cd ..\..\.. +@echo off + +for /f "usebackq tokens=1*" %%f in (`reg query HKCR\Applications\python.exe\shell\open\command 2^>NUL`) do (set _my_=%%f %%g) +goto try1%errorlevel% + +:try10 +goto ok + +:try11 +for /f "usebackq tokens=1*" %%f in (`reg query HKCR\Python.File\shell\open\command 2^>NUL`) do (set _my_=%%f %%g) +goto try2%errorlevel% + +:try20: +goto ok + +:try21: +echo Building without Python ... +goto therest + +:ok +echo Building with Python ... +set _res_=%_my_:*REG_SZ=% +set _end_=%_res_:*exe"=% +call set _python_=%%_res_:%_end_%=%% +echo %_python_% +call %_python_% modules\arch\x86\gen_x86_insn.py + +:therest +@echo on +call :update %1 x86insn_nasm.gperf x86insn_nasm.c +call :update %1 x86insn_gas.gperf x86insn_gas.c +call :update %1 modules\arch\x86\x86cpu.gperf x86cpu.c +call :update %1 modules\arch\x86\x86regtmod.gperf x86regtmod.c +goto :eof + +:update +%1 %2 tf +call mkfiles\vc14\out_copy_rename tf .\ %3 +del tf diff --git a/Mkfiles/vc15/genstring/genstring.vcxproj b/Mkfiles/vc15/genstring/genstring.vcxproj new file mode 100644 index 00000000..3a9e298b --- /dev/null +++ b/Mkfiles/vc15/genstring/genstring.vcxproj @@ -0,0 +1,196 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {021CEB0A-F721-4F59-B349-9CEEAF244459} + genstring + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + false + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + Level3 + ProgramDatabase + Default + + + $(OutDir)genstring.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX86 + + + run.bat "$(TargetPath)" + + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + Level3 + ProgramDatabase + Default + + + $(OutDir)genstring.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + + + run.bat "$(TargetPath)" + + + + + Full + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + Level3 + Default + + + $(OutDir)genstring.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + MachineX86 + + + run.bat "$(TargetPath)" + + + + + Full + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + Level3 + Default + + + $(OutDir)genstring.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + + + run.bat "$(TargetPath)" + + + + + + + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/genstring/genstring.vcxproj.filters b/Mkfiles/vc15/genstring/genstring.vcxproj.filters new file mode 100644 index 00000000..04ed411d --- /dev/null +++ b/Mkfiles/vc15/genstring/genstring.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {28EBE11C-5BE8-4935-9381-F57696749E0C} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/genstring/run.bat b/Mkfiles/vc15/genstring/run.bat new file mode 100644 index 00000000..baedcecb --- /dev/null +++ b/Mkfiles/vc15/genstring/run.bat @@ -0,0 +1,2 @@ +cd ..\..\.. +%1 license_msg license.c COPYING diff --git a/Mkfiles/vc15/genversion/genversion.vcxproj b/Mkfiles/vc15/genversion/genversion.vcxproj new file mode 100644 index 00000000..69079a0a --- /dev/null +++ b/Mkfiles/vc15/genversion/genversion.vcxproj @@ -0,0 +1,223 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B545983B-8EE0-4A7B-A67A-E749EEAE62A2} + genversion + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + false + + + + Disabled + ..\..\vc10;..\..\..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + Level3 + ProgramDatabase + Default + + + $(OutDir)genversion.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX86 + + + run.bat "$(TargetPath)" + + + cd ..\..\..\ +YASM-VERSION-GEN.bat + + + + + + Disabled + ..\..\vc10;..\..\..\;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + Level3 + ProgramDatabase + Default + + + $(OutDir)genversion.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + + + run.bat "$(TargetPath)" + + + cd ..\..\..\ +YASM-VERSION-GEN.bat + + + + + + Full + ..\..\vc10;..\..\..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + Level3 + Default + + + $(OutDir)genversion.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + MachineX86 + + + run.bat "$(TargetPath)" + + + cd ..\..\..\ +YASM-VERSION-GEN.bat + + + + + + Full + ..\..\vc10;..\..\..\;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + Level3 + Default + + + $(OutDir)genversion.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + + + run.bat "$(TargetPath)" + + + cd ..\..\..\ +YASM-VERSION-GEN.bat + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/genversion/genversion.vcxproj.filters b/Mkfiles/vc15/genversion/genversion.vcxproj.filters new file mode 100644 index 00000000..cc088b12 --- /dev/null +++ b/Mkfiles/vc15/genversion/genversion.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {2acbec3a-0ed8-4b2e-826e-a84c7d35f205} + h;hpp;hxx;hm;inl + + + {E67ED277-E4F2-4D79-8C9E-962BAC164F3F} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + + + Header Files + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/genversion/run.bat b/Mkfiles/vc15/genversion/run.bat new file mode 100644 index 00000000..41b19cad --- /dev/null +++ b/Mkfiles/vc15/genversion/run.bat @@ -0,0 +1,2 @@ +cd ..\..\.. +%1 version.mac diff --git a/Mkfiles/vc15/genversion/runpre.bat b/Mkfiles/vc15/genversion/runpre.bat new file mode 100644 index 00000000..fdd15708 --- /dev/null +++ b/Mkfiles/vc15/genversion/runpre.bat @@ -0,0 +1,2 @@ +cd ..\..\.. +YASM-VERSION-GEN.bat diff --git a/Mkfiles/vc15/libyasm-stdint.h b/Mkfiles/vc15/libyasm-stdint.h new file mode 100644 index 00000000..b66ab15f --- /dev/null +++ b/Mkfiles/vc15/libyasm-stdint.h @@ -0,0 +1,8 @@ +#ifndef _UINTPTR_T_DEFINED +#ifdef _WIN64 +#include +#else +typedef unsigned long uintptr_t; +#endif +#define _UINTPTR_T_DEFINED +#endif diff --git a/Mkfiles/vc15/libyasm/libyasm.vcxproj b/Mkfiles/vc15/libyasm/libyasm.vcxproj new file mode 100644 index 00000000..63c5605f --- /dev/null +++ b/Mkfiles/vc15/libyasm/libyasm.vcxproj @@ -0,0 +1,277 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {29FE7874-1256-4AD6-B889-68E399DC9608} + libyasm + + + + StaticLibrary + false + MultiByte + v141 + + + StaticLibrary + false + MultiByte + v141 + + + StaticLibrary + false + MultiByte + v141 + + + StaticLibrary + false + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + + Full + Default + ..;../../..;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + Default + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)libyasm.lib + true + + + + + X64 + + + Full + Default + ..;../../..;%(AdditionalIncludeDirectories) + NDEBUG;_LIB;HAVE_CONFIG_H;WIN64;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + Default + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)libyasm.lib + true + + + + + Disabled + ..;../../..;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + Default + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)libyasm.lib + true + + + + + X64 + + + Disabled + ..;../../..;%(AdditionalIncludeDirectories) + _DEBUG;_LIB;HAVE_CONFIG_H;WIN64;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)libyasm.lib + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {f0e8b707-00c5-4ff2-b8ef-7c39817132a0} + false + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/libyasm/libyasm.vcxproj.filters b/Mkfiles/vc15/libyasm/libyasm.vcxproj.filters new file mode 100644 index 00000000..9bdf13a4 --- /dev/null +++ b/Mkfiles/vc15/libyasm/libyasm.vcxproj.filters @@ -0,0 +1,200 @@ + + + + + {4ca3b698-9d01-4e4e-ae00-5c98da045efe} + h;hpp;hxx;hm;inl + + + {68607062-982d-4251-9a1a-30f76474983d} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Source Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/modules/modules.vcxproj b/Mkfiles/vc15/modules/modules.vcxproj new file mode 100644 index 00000000..51d1dc12 --- /dev/null +++ b/Mkfiles/vc15/modules/modules.vcxproj @@ -0,0 +1,324 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6} + modules + + + + StaticLibrary + false + MultiByte + v141 + + + StaticLibrary + false + MultiByte + v141 + + + StaticLibrary + false + MultiByte + v141 + + + StaticLibrary + false + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + + Full + Default + ..;../../..;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + Default + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)modules.lib + true + + + + + + + + + X64 + + + Full + Default + ..;../../..;%(AdditionalIncludeDirectories) + NDEBUG;_LIB;HAVE_CONFIG_H;WIN64;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + Default + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)modules.lib + true + + + + + Disabled + ..;../../..;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)modules.lib + true + + + + + X64 + + + Disabled + ..;../../..;%(AdditionalIncludeDirectories) + _DEBUG;_LIB;HAVE_CONFIG_H;WIN64;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)modules.lib + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {225700a5-07b8-434e-ad61-555278bf6733} + false + + + {c45a8b59-8b59-4d5d-a8e8-fb090f8dd619} + false + + + {29fe7874-1256-4ad6-b889-68e399dc9608} + false + + + {3c58be13-50a3-4583-984d-d8902b3d7713} + false + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/modules/modules.vcxproj.filters b/Mkfiles/vc15/modules/modules.vcxproj.filters new file mode 100644 index 00000000..e6ff3add --- /dev/null +++ b/Mkfiles/vc15/modules/modules.vcxproj.filters @@ -0,0 +1,256 @@ + + + + + {39c89f91-d860-4396-a49f-86b8b7a51c33} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {be0cdf28-cbed-4774-b3cc-b63e4e3fa0a9} + + + {491cc60a-889b-4f53-aae9-f4d7d6aa667a} + + + {c084015d-3c3e-4379-8746-ae5cffcec79e} + + + {3333e0b3-e95f-44f6-9000-58d4da368360} + + + {528f2955-ceba-4691-a36c-054f119e3dcc} + + + {81686d52-eb71-4d4a-a830-66c45afb808f} + + + {98fe1e43-3794-4639-bf29-14b0c569754f} + + + {6b3956d4-0bff-4e8e-af61-a7e59b476fa4} + + + {446fad62-ac17-49e9-8263-33481f04f182} + + + {33fb7fc8-61f9-428d-9c94-7a4912fbb678} + + + {48fc77ec-7d78-4c0a-bfc2-9aa76faf5d7f} + + + + + Source Files\parsers + + + Source Files\arch + + + Source Files\arch + + + Source Files\arch + + + Source Files\arch + + + Source Files\arch + + + Source Files\arch + + + Source Files\arch + + + Source Files\dbgfmts + + + Source Files\dbgfmts + + + Source Files\dbgfmts + + + Source Files\dbgfmts + + + Source Files\dbgfmts + + + Source Files\dbgfmts + + + Source Files\dbgfmts + + + Source Files\dbgfmts + + + Source Files\dbgfmts + + + Source Files\listfmts\nasm + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\parsers + + + Source Files\parsers + + + Source Files\parsers + + + Source Files\parsers + + + Source Files\parsers + + + Source Files\preprocs\cpp + + + Source Files\preprocs\gas + + + Source Files\preprocs\gas + + + Source Files\preprocs\nasm + + + Source Files\preprocs\nasm + + + Source Files\preprocs\nasm + + + Source Files\preprocs\nasm + + + Source Files\preprocs\raw + + + Source Files\parsers + + + Source Files\arch + + + Source Files\arch + + + Source Files\objfmts + + + + + Source Files\arch + + + Source Files\arch + + + Source Files\dbgfmts + + + Source Files\dbgfmts + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\objfmts + + + Source Files\parsers + + + Source Files\parsers + + + Source Files\preprocs\gas + + + Source Files\preprocs\nasm + + + Source Files\preprocs\nasm + + + Source Files\preprocs\nasm + + + Source Files\preprocs\nasm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/out_copy_rename.bat b/Mkfiles/vc15/out_copy_rename.bat new file mode 100644 index 00000000..3179b59a --- /dev/null +++ b/Mkfiles/vc15/out_copy_rename.bat @@ -0,0 +1,42 @@ +@echo off +if not exist %1 goto nofile +if exist %2 goto copy + +echo creating directory %2 +md %2 > nul + +:copy +set str=%2 +for /f "useback tokens=*" %%a in ('%str%') do set str=%%~a +set str=%str:~-1% +if %str% == "\" goto hasbackslash + +if not exist %2\%3 goto cpy +fc %1 %2\%3 > nul && if not %errorlevel 1 goto exit +echo overwriting %2\%3 with %1 +copy %1 %2\%3 > nul +goto exit + +:cpy +echo copying %1 to %2\%3 +copy %1 %2\%3 > nul +goto exit + +:hasbackslash +if not exist %2%3 goto cpy2 +fc %1 %2%3 > nul && if not %errorlevel 1 goto exit +echo overwriting %2%3 with %1 +copy %1 %2%3 > nul +goto exit + +:cpy2 +echo copying %1 to %2%3 +copy %1 %2%3 > nul +goto exit + +:nofile +echo %1 not found + +:exit + + diff --git a/Mkfiles/vc15/re2c/re2c.vcxproj b/Mkfiles/vc15/re2c/re2c.vcxproj new file mode 100644 index 00000000..62eb2d0c --- /dev/null +++ b/Mkfiles/vc15/re2c/re2c.vcxproj @@ -0,0 +1,221 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3C58BE13-50A3-4583-984D-D8902B3D7713} + re2c + Win32Proj + + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + Application + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + false + + + + Disabled + ..;../../..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + Level3 + Default + ProgramDatabase + + + $(OutDir)re2c.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX86 + + + run.bat "$(TargetPath)" + + + + + Disabled + ..;../../..;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + $(IntDir) + Level3 + Default + ProgramDatabase + + + $(OutDir)re2c.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + + + run.bat "$(TargetPath)" + + + + + Full + ..;../../..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + Level3 + Default + + + $(OutDir)re2c.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + MachineX86 + + + run.bat "$(TargetPath)" + + + + + Full + ..;../../..;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + $(IntDir) + Level3 + Default + + + $(OutDir)re2c.exe + $(OutDir)$(TargetName).pdb + Console + true + true + false + + + + + run.bat "$(TargetPath)" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/re2c/re2c.vcxproj.filters b/Mkfiles/vc15/re2c/re2c.vcxproj.filters new file mode 100644 index 00000000..da0f935c --- /dev/null +++ b/Mkfiles/vc15/re2c/re2c.vcxproj.filters @@ -0,0 +1,80 @@ + + + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/re2c/run.bat b/Mkfiles/vc15/re2c/run.bat new file mode 100644 index 00000000..6ac571f0 --- /dev/null +++ b/Mkfiles/vc15/re2c/run.bat @@ -0,0 +1,4 @@ +cd ..\..\..\ +%1 -s -o lc3bid.c modules\arch\lc3b\lc3bid.re +%1 -b -o nasm-token.c modules\parsers\nasm\nasm-token.re +%1 -b -o gas-token.c modules\parsers\gas\gas-token.re diff --git a/Mkfiles/vc15/readme.vc14.txt b/Mkfiles/vc15/readme.vc14.txt new file mode 100644 index 00000000..ea716567 --- /dev/null +++ b/Mkfiles/vc15/readme.vc14.txt @@ -0,0 +1,106 @@ +Building YASM with Microsoft Visual Studio 2015 (C/C++ v14) +----------------------------------------------------------- + +This note describes how to build YASM using Microsoft Visual +Studio 2015 (C/C++ v14). + +1. YASM Download +---------------- + +First YASM needs to be downloaded and the files placed within +a suitable directory, which will be called here but can +be named and located as you wish. + +2. Building YASM with Microsoft 2015 (VC14) +------------------------------------------- + +Now locate and double click on the yasm.sln solution file in +the 'Mkfiles/vc14' subdirectory to open the build project in +the Visual Studio 2015 IDE and then select: + + win32 or x64 build + release or debug build + +as appropriate to build the YASM binaries that you need. + +4. Using YASM with Visual Sudio 2015 and VC++ version 14 +-------------------------------------------------------- + +The YASM version vsyasm.exe is designed specifically for use +with the 2010 and later versions of Visual Studio. To tell +Visual Studio where to find vsyasm.exe, the environment +variable YASMPATH can be set to the absolute path of the +directory in which vsyasm.exe is located (this path should +include the final backslash). + +Alternatively you can find the directory (or directories) +where the VC++ compiler binaries are located and put copies +of the vsyasm.exe binary in these directories. The typical +location on 64-bit Windows is: + +C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin + +On 32-bit Windows it is normally at: + +C:\Program Files\Microsoft Visual Studio 14.0\VC\bin + +Depending on your system you can use either the win32 or the +x64 version of vsyasm.exe, which must be named vsyasm.exe. + +To use the custom tools facility in Visual Studio 2015, you +need to place a copy of three files - yasm.props, yasm.targets +and yasm.xml - into a location where they can be found by the +Visual Studio build customisation processes. There are several +ways to do this: + + a. put these files in the MSBUILD customisation directory, + which is typically at: + + C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\BuildCustomizations + + b. put them in a convenient location and set this path in the + 'Build Customisations Search Path' in the Visual Studio + 'Projects and Solutions|VC++ Project Settings' item in + the 'Tools|Options' menu; + + c. put them in a convenient location and set this path in the + 'Build Customisation dialogue (discussed later). + +To use YASM in a project, right click on the project in the Solution +Explorer and select 'Build Customisations..'. This will give you a +dialog box that allows you to select YASM as an assembler (note that +your assembler files need to have the extension '.asm'). If you have +used option c. above, you will need to let the dialogue find them +using the 'Find Existing' button below the dialogue. + +To assemble a file with YASM, select the Property Page for the file +and the select 'Yasm Assembler' in the Tool dialog entry. Then click +'Apply' and an additional property page entry will appear and enable +YASM settings to be established. + +5. A Linker Issue +----------------- + +There appears to be a linker bug in the VC++ linker that prevents +symbols with absolute addresses being linked in DLL builds. This +means, for example, that LEA instructions of the general form: + + lea, rax,[rax+symbol] + +cannot be used for DLL builds. The following general form +has to be used instead: + + lea rcx,[symbol wrt rip] + lea rax,[rax+rcx] + +This limitation may also cause problems with other instruction +that use absolute addresses. + +6. Acknowledgements +------------------- + +I am most grateful for the fantastic support that Peter Johnson, +YASM's creator, has given me in tracking down issues in using +YASM for the production of Windows x64 code. + + Brian Gladman, 30th April 2015 diff --git a/Mkfiles/vc15/vsyasm.props b/Mkfiles/vc15/vsyasm.props new file mode 100644 index 00000000..80b93c7e --- /dev/null +++ b/Mkfiles/vc15/vsyasm.props @@ -0,0 +1,27 @@ + + + + Midl + CustomBuild + + + _SelectedFiles;$(YASMDependsOn) + + + $(VCInstallDir)bin\ + + + + False + $(IntDir) + 0 + 0 + "$(YasmPath)"vsyasm.exe -Xvc -f $(Platform) [AllOptions] [AdditionalOptions] [Inputs] + %(ObjectFile) + Assembling %(Filename)%(Extension) + false + + + \ No newline at end of file diff --git a/Mkfiles/vc15/vsyasm.targets b/Mkfiles/vc15/vsyasm.targets new file mode 100644 index 00000000..3c084119 --- /dev/null +++ b/Mkfiles/vc15/vsyasm.targets @@ -0,0 +1,108 @@ + + + + + + _YASM + + + + $(MSBuildThisFileDirectory)$(MSBuildThisFileName).xml + + + + + + + + @(YASM, '|') + + + + + + + + + $(ComputeLinkInputsTargets); + ComputeYASMOutput; + + + $(ComputeLibInputsTargets); + ComputeYASMOutput; + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/vsyasm.vcxproj b/Mkfiles/vc15/vsyasm.vcxproj new file mode 100644 index 00000000..9328dcf8 --- /dev/null +++ b/Mkfiles/vc15/vsyasm.vcxproj @@ -0,0 +1,279 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {7FDD85BB-CC86-442B-A425-989B5B296ED5} + vsyasm + + + + Application + false + MultiByte + v141 + + + Application + false + MultiByte + v141 + + + Application + false + MultiByte + v141 + + + Application + false + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + $(Platform)\$(Configuration)/yasm.tlb + + + + + Disabled + .;../..;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;HAVE_CONFIG_H;VC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)vsyasm.exe + true + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + + + + + X64 + $(Platform)\$(Configuration)/yasm.tlb + + + + + Disabled + .;../..;%(AdditionalIncludeDirectories) + _DEBUG;_LIB;HAVE_CONFIG_H;VC;WIN64;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)vsyasm.exe + true + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX64 + + + + + $(Platform)\$(Configuration)/yasm.tlb + + + + + Full + Default + true + .;../..;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;VC;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + Default + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)vsyasm.exe + true + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + + + + + X64 + $(Platform)\$(Configuration)/yasm.tlb + + + + + Full + OnlyExplicitInline + .;../..;%(AdditionalIncludeDirectories) + NDEBUG;_LIB;HAVE_CONFIG_H;VC;WIN64;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + Default + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)vsyasm.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX64 + true + + + + + + + + + {29fe7874-1256-4ad6-b889-68e399dc9608} + false + + + {d715a3d4-efaa-442e-ad8b-5b4ff64e1dd6} + false + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/vsyasm.xml b/Mkfiles/vc15/vsyasm.xml new file mode 100644 index 00000000..a108f005 --- /dev/null +++ b/Mkfiles/vc15/vsyasm.xml @@ -0,0 +1,283 @@ + + + + + + + + + + + + + General + + + + + + Symbols + + + + + + Files + + + + + + Command Line + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Execute Before + + + Specifies the targets for the build customization to run before. + + + + + + + + + + + + Execute After + + + Specifies the targets for the build customization to run after. + + + + + + + + + + + + + + + + + + Additional Options + + + Additional Options + + + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/yasm.sln b/Mkfiles/vc15/yasm.sln new file mode 100644 index 00000000..5d2dc952 --- /dev/null +++ b/Mkfiles/vc15/yasm.sln @@ -0,0 +1,142 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.22823.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{825AC694-358C-4D8D-92DE-33A2691978CE}" + ProjectSection(SolutionItems) = preProject + crt_secure_no_deprecate.vsprops = crt_secure_no_deprecate.vsprops + readme.vc14.txt = readme.vc14.txt + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyasm", "libyasm\libyasm.vcxproj", "{29FE7874-1256-4AD6-B889-68E399DC9608}" + ProjectSection(ProjectDependencies) = postProject + {B545983B-8EE0-4A7B-A67A-E749EEAE62A2} = {B545983B-8EE0-4A7B-A67A-E749EEAE62A2} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modules", "modules\modules.vcxproj", "{D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yasm", "yasm.vcxproj", "{34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genmacro", "genmacro\genmacro.vcxproj", "{225700A5-07B8-434E-AD61-555278BF6733}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genversion", "genversion\genversion.vcxproj", "{B545983B-8EE0-4A7B-A67A-E749EEAE62A2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "re2c", "re2c\re2c.vcxproj", "{3C58BE13-50A3-4583-984D-D8902B3D7713}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genperf", "genperf\genperf.vcxproj", "{C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genmodule", "genmodule\genmodule.vcxproj", "{F0E8B707-00C5-4FF2-B8EF-7C39817132A0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genstring", "genstring\genstring.vcxproj", "{021CEB0A-F721-4F59-B349-9CEEAF244459}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ytasm", "ytasm.vcxproj", "{2162937B-0DBD-4450-B45F-DF578D8E7508}" + ProjectSection(ProjectDependencies) = postProject + {021CEB0A-F721-4F59-B349-9CEEAF244459} = {021CEB0A-F721-4F59-B349-9CEEAF244459} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsyasm", "vsyasm.vcxproj", "{7FDD85BB-CC86-442B-A425-989B5B296ED5}" + ProjectSection(ProjectDependencies) = postProject + {021CEB0A-F721-4F59-B349-9CEEAF244459} = {021CEB0A-F721-4F59-B349-9CEEAF244459} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {29FE7874-1256-4AD6-B889-68E399DC9608}.Debug|Win32.ActiveCfg = Debug|Win32 + {29FE7874-1256-4AD6-B889-68E399DC9608}.Debug|Win32.Build.0 = Debug|Win32 + {29FE7874-1256-4AD6-B889-68E399DC9608}.Debug|x64.ActiveCfg = Debug|x64 + {29FE7874-1256-4AD6-B889-68E399DC9608}.Debug|x64.Build.0 = Debug|x64 + {29FE7874-1256-4AD6-B889-68E399DC9608}.Release|Win32.ActiveCfg = Release|Win32 + {29FE7874-1256-4AD6-B889-68E399DC9608}.Release|Win32.Build.0 = Release|Win32 + {29FE7874-1256-4AD6-B889-68E399DC9608}.Release|x64.ActiveCfg = Release|x64 + {29FE7874-1256-4AD6-B889-68E399DC9608}.Release|x64.Build.0 = Release|x64 + {D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}.Debug|Win32.ActiveCfg = Debug|Win32 + {D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}.Debug|Win32.Build.0 = Debug|Win32 + {D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}.Debug|x64.ActiveCfg = Debug|x64 + {D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}.Debug|x64.Build.0 = Debug|x64 + {D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}.Release|Win32.ActiveCfg = Release|Win32 + {D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}.Release|Win32.Build.0 = Release|Win32 + {D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}.Release|x64.ActiveCfg = Release|x64 + {D715A3D4-EFAA-442E-AD8B-5B4FF64E1DD6}.Release|x64.Build.0 = Release|x64 + {34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}.Debug|Win32.ActiveCfg = Debug|Win32 + {34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}.Debug|Win32.Build.0 = Debug|Win32 + {34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}.Debug|x64.ActiveCfg = Debug|x64 + {34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}.Debug|x64.Build.0 = Debug|x64 + {34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}.Release|Win32.ActiveCfg = Release|Win32 + {34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}.Release|Win32.Build.0 = Release|Win32 + {34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}.Release|x64.ActiveCfg = Release|x64 + {34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5}.Release|x64.Build.0 = Release|x64 + {225700A5-07B8-434E-AD61-555278BF6733}.Debug|Win32.ActiveCfg = Debug|Win32 + {225700A5-07B8-434E-AD61-555278BF6733}.Debug|Win32.Build.0 = Debug|Win32 + {225700A5-07B8-434E-AD61-555278BF6733}.Debug|x64.ActiveCfg = Debug|Win32 + {225700A5-07B8-434E-AD61-555278BF6733}.Debug|x64.Build.0 = Debug|Win32 + {225700A5-07B8-434E-AD61-555278BF6733}.Release|Win32.ActiveCfg = Release|Win32 + {225700A5-07B8-434E-AD61-555278BF6733}.Release|Win32.Build.0 = Release|Win32 + {225700A5-07B8-434E-AD61-555278BF6733}.Release|x64.ActiveCfg = Release|x64 + {225700A5-07B8-434E-AD61-555278BF6733}.Release|x64.Build.0 = Release|x64 + {B545983B-8EE0-4A7B-A67A-E749EEAE62A2}.Debug|Win32.ActiveCfg = Debug|Win32 + {B545983B-8EE0-4A7B-A67A-E749EEAE62A2}.Debug|Win32.Build.0 = Debug|Win32 + {B545983B-8EE0-4A7B-A67A-E749EEAE62A2}.Debug|x64.ActiveCfg = Debug|Win32 + {B545983B-8EE0-4A7B-A67A-E749EEAE62A2}.Debug|x64.Build.0 = Debug|Win32 + {B545983B-8EE0-4A7B-A67A-E749EEAE62A2}.Release|Win32.ActiveCfg = Release|Win32 + {B545983B-8EE0-4A7B-A67A-E749EEAE62A2}.Release|Win32.Build.0 = Release|Win32 + {B545983B-8EE0-4A7B-A67A-E749EEAE62A2}.Release|x64.ActiveCfg = Release|x64 + {B545983B-8EE0-4A7B-A67A-E749EEAE62A2}.Release|x64.Build.0 = Release|x64 + {3C58BE13-50A3-4583-984D-D8902B3D7713}.Debug|Win32.ActiveCfg = Debug|Win32 + {3C58BE13-50A3-4583-984D-D8902B3D7713}.Debug|Win32.Build.0 = Debug|Win32 + {3C58BE13-50A3-4583-984D-D8902B3D7713}.Debug|x64.ActiveCfg = Debug|Win32 + {3C58BE13-50A3-4583-984D-D8902B3D7713}.Debug|x64.Build.0 = Debug|Win32 + {3C58BE13-50A3-4583-984D-D8902B3D7713}.Release|Win32.ActiveCfg = Release|Win32 + {3C58BE13-50A3-4583-984D-D8902B3D7713}.Release|Win32.Build.0 = Release|Win32 + {3C58BE13-50A3-4583-984D-D8902B3D7713}.Release|x64.ActiveCfg = Release|x64 + {3C58BE13-50A3-4583-984D-D8902B3D7713}.Release|x64.Build.0 = Release|x64 + {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Debug|Win32.ActiveCfg = Debug|Win32 + {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Debug|Win32.Build.0 = Debug|Win32 + {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Debug|x64.ActiveCfg = Debug|Win32 + {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Debug|x64.Build.0 = Debug|Win32 + {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Release|Win32.ActiveCfg = Release|Win32 + {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Release|Win32.Build.0 = Release|Win32 + {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Release|x64.ActiveCfg = Release|x64 + {C45A8B59-8B59-4D5D-A8E8-FB090F8DD619}.Release|x64.Build.0 = Release|x64 + {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Debug|Win32.ActiveCfg = Debug|Win32 + {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Debug|Win32.Build.0 = Debug|Win32 + {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Debug|x64.ActiveCfg = Debug|Win32 + {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Debug|x64.Build.0 = Debug|Win32 + {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Release|Win32.ActiveCfg = Release|Win32 + {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Release|Win32.Build.0 = Release|Win32 + {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Release|x64.ActiveCfg = Release|x64 + {F0E8B707-00C5-4FF2-B8EF-7C39817132A0}.Release|x64.Build.0 = Release|x64 + {021CEB0A-F721-4F59-B349-9CEEAF244459}.Debug|Win32.ActiveCfg = Debug|Win32 + {021CEB0A-F721-4F59-B349-9CEEAF244459}.Debug|Win32.Build.0 = Debug|Win32 + {021CEB0A-F721-4F59-B349-9CEEAF244459}.Debug|x64.ActiveCfg = Debug|Win32 + {021CEB0A-F721-4F59-B349-9CEEAF244459}.Debug|x64.Build.0 = Debug|Win32 + {021CEB0A-F721-4F59-B349-9CEEAF244459}.Release|Win32.ActiveCfg = Release|Win32 + {021CEB0A-F721-4F59-B349-9CEEAF244459}.Release|Win32.Build.0 = Release|Win32 + {021CEB0A-F721-4F59-B349-9CEEAF244459}.Release|x64.ActiveCfg = Release|x64 + {021CEB0A-F721-4F59-B349-9CEEAF244459}.Release|x64.Build.0 = Release|x64 + {2162937B-0DBD-4450-B45F-DF578D8E7508}.Debug|Win32.ActiveCfg = Debug|Win32 + {2162937B-0DBD-4450-B45F-DF578D8E7508}.Debug|Win32.Build.0 = Debug|Win32 + {2162937B-0DBD-4450-B45F-DF578D8E7508}.Debug|x64.ActiveCfg = Debug|x64 + {2162937B-0DBD-4450-B45F-DF578D8E7508}.Debug|x64.Build.0 = Debug|x64 + {2162937B-0DBD-4450-B45F-DF578D8E7508}.Release|Win32.ActiveCfg = Release|Win32 + {2162937B-0DBD-4450-B45F-DF578D8E7508}.Release|Win32.Build.0 = Release|Win32 + {2162937B-0DBD-4450-B45F-DF578D8E7508}.Release|x64.ActiveCfg = Release|x64 + {2162937B-0DBD-4450-B45F-DF578D8E7508}.Release|x64.Build.0 = Release|x64 + {7FDD85BB-CC86-442B-A425-989B5B296ED5}.Debug|Win32.ActiveCfg = Debug|Win32 + {7FDD85BB-CC86-442B-A425-989B5B296ED5}.Debug|Win32.Build.0 = Debug|Win32 + {7FDD85BB-CC86-442B-A425-989B5B296ED5}.Debug|x64.ActiveCfg = Debug|x64 + {7FDD85BB-CC86-442B-A425-989B5B296ED5}.Debug|x64.Build.0 = Debug|x64 + {7FDD85BB-CC86-442B-A425-989B5B296ED5}.Release|Win32.ActiveCfg = Release|Win32 + {7FDD85BB-CC86-442B-A425-989B5B296ED5}.Release|Win32.Build.0 = Release|Win32 + {7FDD85BB-CC86-442B-A425-989B5B296ED5}.Release|x64.ActiveCfg = Release|x64 + {7FDD85BB-CC86-442B-A425-989B5B296ED5}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Mkfiles/vc15/yasm.vcxproj b/Mkfiles/vc15/yasm.vcxproj new file mode 100644 index 00000000..dd041da0 --- /dev/null +++ b/Mkfiles/vc15/yasm.vcxproj @@ -0,0 +1,283 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {34EB1BEB-C2D6-4A52-82B7-7ACD714A30D5} + yasm + + + + Application + false + MultiByte + v141 + + + Application + false + MultiByte + v141 + + + Application + false + MultiByte + v141 + + + Application + false + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + $(Platform)\$(Configuration)/yasm.tlb + + + + + Disabled + .;../..;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;HAVE_CONFIG_H;VC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)yasm.exe + true + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + + + + + X64 + $(Platform)\$(Configuration)/yasm.tlb + + + + + Disabled + .;../..;%(AdditionalIncludeDirectories) + _DEBUG;_LIB;HAVE_CONFIG_H;VC;WIN64;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)yasm.exe + true + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX64 + + + + + $(Platform)\$(Configuration)/yasm.tlb + + + + + Full + Default + true + .;../..;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;VC;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + Default + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)yasm.exe + true + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + + + + + X64 + $(Platform)\$(Configuration)/yasm.tlb + + + + + Full + OnlyExplicitInline + .;../..;%(AdditionalIncludeDirectories) + NDEBUG;_LIB;HAVE_CONFIG_H;VC;WIN64;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + Default + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)yasm.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX64 + true + + + + + + + + + + + + + + + + + {021ceb0a-f721-4f59-b349-9ceeaf244459} + false + + + {29fe7874-1256-4ad6-b889-68e399dc9608} + false + + + {d715a3d4-efaa-442e-ad8b-5b4ff64e1dd6} + false + + + + + + \ No newline at end of file diff --git a/Mkfiles/vc15/yasm.vcxproj.filters b/Mkfiles/vc15/yasm.vcxproj.filters new file mode 100644 index 00000000..04941c22 --- /dev/null +++ b/Mkfiles/vc15/yasm.vcxproj.filters @@ -0,0 +1,41 @@ + + + + + {51f0d88e-1373-4bf8-a72e-c79706d37f8b} + h;hpp;hxx;hm;inl + + + {db67b411-6f59-462c-9c20-75024c6b3912} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Mkfiles/vc15/ytasm.vcxproj b/Mkfiles/vc15/ytasm.vcxproj new file mode 100644 index 00000000..9d90e255 --- /dev/null +++ b/Mkfiles/vc15/ytasm.vcxproj @@ -0,0 +1,278 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2162937B-0DBD-4450-B45F-DF578D8E7508} + ytasm + + + + Application + false + MultiByte + v141 + + + Application + false + MultiByte + v141 + + + Application + false + MultiByte + v141 + + + Application + false + MultiByte + v141 + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.21006.1 + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + + + + $(Platform)\$(Configuration)/yasm.tlb + + + + + Disabled + .;../..;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;HAVE_CONFIG_H;VC;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)ytasm.exe + true + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + + + + + X64 + $(Platform)\$(Configuration)/yasm.tlb + + + + + Disabled + .;../..;%(AdditionalIncludeDirectories) + _DEBUG;_LIB;HAVE_CONFIG_H;VC;WIN64;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)ytasm.exe + true + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX64 + + + + + $(Platform)\$(Configuration)/yasm.tlb + + + + + Full + Default + true + .;../..;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;VC;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + Default + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)ytasm.exe + true + true + $(OutDir)$(ProjectName).pdb + Console + false + + + MachineX86 + + + + + X64 + $(Platform)\$(Configuration)/yasm.tlb + + + + + Full + OnlyExplicitInline + .;../..;%(AdditionalIncludeDirectories) + NDEBUG;_LIB;HAVE_CONFIG_H;VC;WIN64;%(PreprocessorDefinitions) + true + MultiThreaded + true + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + Default + ProgramDatabase + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + $(OutDir)ytasm.exe + true + $(OutDir)$(TargetName).pdb + Console + false + + + MachineX64 + true + + + + + + + + + + + + + + + + {29fe7874-1256-4ad6-b889-68e399dc9608} + false + + + {d715a3d4-efaa-442e-ad8b-5b4ff64e1dd6} + false + + + + + + \ No newline at end of file -- cgit v1.2.1