Mercurial > hg > index.cgi
changeset 386:221b5f58d8ad
Port remainder of tools to Windows
Thanks to Erik G <erik@6809.org> for the patch.
Quoth Erik:
"As a thank you for putting up with my nonsense, I ported the remaining
binaries. Although I'm not using them (yet), I did verify that they work and
the changes are basically zero so I have confidence in them."
| author | William Astle <lost@l-w.ca> |
|---|---|
| date | Mon, 13 Jul 2015 21:32:39 -0600 |
| parents | 4fd16faa4d93 |
| children | 2abcd82b455f |
| files | lwar/lwar.c lwar/main.c lwar/replace.c lwasm/lwasm.h lwlink/link.c lwlink/lwlink.h lwlink/main.c lwlink/readfiles.c win/lwtools.sln |
| diffstat | 9 files changed, 43 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lwar/lwar.c Mon Jul 13 21:26:34 2015 -0600 +++ b/lwar/lwar.c Mon Jul 13 21:32:39 2015 -0600 @@ -26,7 +26,6 @@ #include <stdlib.h> #include <sys/stat.h> #include <sys/types.h> -#include <unistd.h> #include <lw_alloc.h>
--- a/lwar/main.c Mon Jul 13 21:26:34 2015 -0600 +++ b/lwar/main.c Mon Jul 13 21:32:39 2015 -0600 @@ -27,13 +27,18 @@ #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> -#include <unistd.h> #include <lw_cmdline.h> #include <lw_version.h> #include "lwar.h" +#ifdef _MSC_VER +#include <lw_win.h> // windows build +#else +#include <unistd.h> +#endif + // command line option handling #define PROGVER "lwar from " PACKAGE_STRING char *program_name;
--- a/lwar/replace.c Mon Jul 13 21:26:34 2015 -0600 +++ b/lwar/replace.c Mon Jul 13 21:32:39 2015 -0600 @@ -23,7 +23,12 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> + +#ifdef _MSC_VER +#include <lw_win.h> // windows build +#else #include <unistd.h> +#endif #include "lwar.h"
--- a/lwasm/lwasm.h Mon Jul 13 21:26:34 2015 -0600 +++ b/lwasm/lwasm.h Mon Jul 13 21:32:39 2015 -0600 @@ -23,7 +23,7 @@ #define ___lwasm_h_seen___ #ifdef _MSC_VER -#include "lw_win.h" // windows build +#include <lw_win.h> // windows build #endif #include <lw_expr.h>
--- a/lwlink/link.c Mon Jul 13 21:26:34 2015 -0600 +++ b/lwlink/link.c Mon Jul 13 21:32:39 2015 -0600 @@ -31,6 +31,10 @@ #include "expr.h" #include "lwlink.h" +#ifdef _MSC_VER +#include <lw_win.h> // windows build +#endif + void check_os9(void); struct section_list *sectlist = NULL;
--- a/lwlink/lwlink.h Mon Jul 13 21:26:34 2015 -0600 +++ b/lwlink/lwlink.h Mon Jul 13 21:32:39 2015 -0600 @@ -80,7 +80,7 @@ { char *filename; unsigned char *filedata; - long filesize; + int filesize; section_t *sections; int nsections; int islib; // set to true if the file is a "-l" option
--- a/lwlink/main.c Mon Jul 13 21:26:34 2015 -0600 +++ b/lwlink/main.c Mon Jul 13 21:32:39 2015 -0600 @@ -25,7 +25,6 @@ #include <errno.h> #include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <string.h> #include <lw_cmdline.h> @@ -33,6 +32,12 @@ #include "lwlink.h" +#ifdef _MSC_VER +#include <lw_win.h> // windows build +#else +#include <unistd.h> +#endif + char *program_name; // command line option handling
--- a/lwlink/readfiles.c Mon Jul 13 21:26:34 2015 -0600 +++ b/lwlink/readfiles.c Mon Jul 13 21:32:39 2015 -0600 @@ -388,8 +388,8 @@ */ void read_lwar1v(fileinfo_t *fn) { - unsigned long cc = 6; - unsigned long flen; + int cc = 6; + int flen; unsigned long l; for (;;) {
--- a/win/lwtools.sln Mon Jul 13 21:26:34 2015 -0600 +++ b/win/lwtools.sln Mon Jul 13 21:32:39 2015 -0600 @@ -7,6 +7,12 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwasm", "lwasm.vcxproj", "{52309F4D-C1D8-43FC-BC02-C71B69D01E3B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwlink", "lwlink.vcxproj", "{FF4E3359-4B82-4111-8D32-16E0DCFAE39E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwar", "lwar.vcxproj", "{D3F0DBD9-6275-428B-950F-01FE32D77A58}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwobjdump", "lwobjdump.vcxproj", "{852540C9-DEA5-4BFF-BE18-FD946C3857AA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -21,6 +27,18 @@ {52309F4D-C1D8-43FC-BC02-C71B69D01E3B}.Debug|Win32.Build.0 = Debug|Win32 {52309F4D-C1D8-43FC-BC02-C71B69D01E3B}.Release|Win32.ActiveCfg = Release|Win32 {52309F4D-C1D8-43FC-BC02-C71B69D01E3B}.Release|Win32.Build.0 = Release|Win32 + {FF4E3359-4B82-4111-8D32-16E0DCFAE39E}.Debug|Win32.ActiveCfg = Debug|Win32 + {FF4E3359-4B82-4111-8D32-16E0DCFAE39E}.Debug|Win32.Build.0 = Debug|Win32 + {FF4E3359-4B82-4111-8D32-16E0DCFAE39E}.Release|Win32.ActiveCfg = Release|Win32 + {FF4E3359-4B82-4111-8D32-16E0DCFAE39E}.Release|Win32.Build.0 = Release|Win32 + {D3F0DBD9-6275-428B-950F-01FE32D77A58}.Debug|Win32.ActiveCfg = Debug|Win32 + {D3F0DBD9-6275-428B-950F-01FE32D77A58}.Debug|Win32.Build.0 = Debug|Win32 + {D3F0DBD9-6275-428B-950F-01FE32D77A58}.Release|Win32.ActiveCfg = Release|Win32 + {D3F0DBD9-6275-428B-950F-01FE32D77A58}.Release|Win32.Build.0 = Release|Win32 + {852540C9-DEA5-4BFF-BE18-FD946C3857AA}.Debug|Win32.ActiveCfg = Debug|Win32 + {852540C9-DEA5-4BFF-BE18-FD946C3857AA}.Debug|Win32.Build.0 = Debug|Win32 + {852540C9-DEA5-4BFF-BE18-FD946C3857AA}.Release|Win32.ActiveCfg = Release|Win32 + {852540C9-DEA5-4BFF-BE18-FD946C3857AA}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE