# HG changeset patch
# User matsl at xemacs.org
# Date 1271459908 -7200
# Node ID 0c7745e1cf9a40362002170260a46aaca1cc4595
# Parent 04811a268716dbb77524e2ab2364a243a1c5c29c
Build with VS 2008.
diff -r 04811a268716 -r 0c7745e1cf9a nt/xemacs.mak
--- a/nt/xemacs.mak Sun Aug 15 15:42:45 2010 +0100
+++ b/nt/xemacs.mak Sat Apr 17 01:18:28 2010 +0200
@@ -796,6 +796,7 @@
DEFINES=$(OPT_DEFINES) \
-DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs \
+ -DNTDDI_VERSION=NTDDI_WIN2K -D_WIN32_WINNT=_WIN32_WINNT_WIN2K \
-DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
CFLAGS_NO_OPT=-nologo -W3 -DSTRICT $(DEBUG_FLAGS_COMPILE)
diff -r 04811a268716 -r 0c7745e1cf9a nt/xemacs.sln
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nt/xemacs.sln Sat Apr 17 01:18:28 2010 +0200
@@ -0,0 +1,20 @@
+~
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xemacs", "xemacs.vcproj", "{D2504E5C-E657-4C9C-8EAA-4BAF2F7AA04E}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {D2504E5C-E657-4C9C-8EAA-4BAF2F7AA04E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D2504E5C-E657-4C9C-8EAA-4BAF2F7AA04E}.Debug|Win32.Build.0 = Debug|Win32
+ {D2504E5C-E657-4C9C-8EAA-4BAF2F7AA04E}.Release|Win32.ActiveCfg = Release|Win32
+ {D2504E5C-E657-4C9C-8EAA-4BAF2F7AA04E}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff -r 04811a268716 -r 0c7745e1cf9a nt/xemacs.vcproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nt/xemacs.vcproj Sat Apr 17 01:18:28 2010 +0200
@@ -0,0 +1,1301 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 04811a268716 -r 0c7745e1cf9a src/intl-auto-encap-win32.c
--- a/src/intl-auto-encap-win32.c Sun Aug 15 15:42:45 2010 +0100
+++ b/src/intl-auto-encap-win32.c Sat Apr 17 01:18:28 2010 +0200
@@ -40,9 +40,9 @@
qxeReadConsole (HANDLE arg1, PVOID arg2, DWORD arg3, PDWORD arg4, PVOID arg5)
{
if (XEUNICODE_P)
- return ReadConsoleW (arg1, arg2, arg3, arg4, arg5);
- else
- return ReadConsoleA (arg1, arg2, arg3, arg4, arg5);
+ return ReadConsoleW ((PCONSOLE_READCONSOLE_CONTROL)arg1, arg2, arg3, arg4, (PCONSOLE_READCONSOLE_CONTROL)arg5);
+ else
+ return ReadConsoleA (arg1, arg2, arg3, arg4, (PCONSOLE_READCONSOLE_CONTROL)arg5);
}
BOOL
# HG changeset patch
# User Mats Lidell
# Date 1284703602 -7200
# Node ID c67f2d0ce11c08555918160568e76535cf8c98be
# Parent 0c7745e1cf9a40362002170260a46aaca1cc4595
Headerfile location in gmp depends on static or dynamic.
diff -r 0c7745e1cf9a -r c67f2d0ce11c nt/xemacs.mak
--- a/nt/xemacs.mak Sat Apr 17 01:18:28 2010 +0200
+++ b/nt/xemacs.mak Fri Sep 17 08:06:42 2010 +0200
@@ -584,10 +584,10 @@
!else
!if $(BUILD_BIGNUM_NATIVE_SHARED)
OPT_LIBS=$(OPT_LIBS) "$(BIGNUM_DIR)\gmp-dynamic\gmp.lib"
-OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)"
+OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)\gmp-dynamic"
!else
OPT_LIBS=$(OPT_LIBS) "$(BIGNUM_DIR)\gmp-static\gmp.lib"
-OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)"
+OPT_INCLUDES=$(OPT_INCLUDES) -I"$(BIGNUM_DIR)\gmp-static"
!endif
!endif
OPT_OBJS=$(OPT_OBJS) $(OUTDIR)\number-gmp.obj $(OUTDIR)\number.obj
@@ -796,7 +796,6 @@
DEFINES=$(OPT_DEFINES) \
-DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs \
- -DNTDDI_VERSION=NTDDI_WIN2K -D_WIN32_WINNT=_WIN32_WINNT_WIN2K \
-DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
CFLAGS_NO_OPT=-nologo -W3 -DSTRICT $(DEBUG_FLAGS_COMPILE)
# HG changeset patch
# User Mats Lidell
# Date 1289301480 -3600
# Node ID 64b5837d3f614eec28fee4e2e9bf1064b792aa4e
# Parent 8e32d29c1c581a17655ff8798b0d85dfa1f8bf18
Set compiler options for WIN2K that seems to be needed.
diff -r 8e32d29c1c58 -r 64b5837d3f61 nt/xemacs.mak
--- a/nt/xemacs.mak Fri Sep 17 08:07:20 2010 +0200
+++ b/nt/xemacs.mak Tue Nov 09 12:18:00 2010 +0100
@@ -796,6 +796,7 @@
DEFINES=$(OPT_DEFINES) \
-DWIN32_LEAN_AND_MEAN -DWIN32_NATIVE -Demacs \
+ -DNTDDI_VERSION=NTDDI_WIN2K -D_WIN32_WINNT=_WIN32_WINNT_WIN2K \
-DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
CFLAGS_NO_OPT=-nologo -W3 -DSTRICT $(DEBUG_FLAGS_COMPILE)