summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorBen Key <bkey1@tampabay.rr.com>2002-11-17 22:35:26 +0000
committerBen Key <bkey1@tampabay.rr.com>2002-11-17 22:35:26 +0000
commitf60ae425e9095d06f4ad06e5b277903606c25dca (patch)
tree5cf0be810c07412c8e145c431327f53df9e8ad89 /nt
parent87a609d3fb43ab67d043ae2462ac5aacff9381c1 (diff)
downloademacs-f60ae425e9095d06f4ad06e5b277903606c25dca.tar.gz
Added a partial implementation of play-sound-internal for Windows. Fixed the following entry in etc/PROBLEMS: Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs built on XP crashes at startup on Windows 9x/ME.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog8
-rw-r--r--nt/gmake.defs1
-rw-r--r--nt/nmake.defs1
3 files changed, 10 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 8b0172f2e8c..a8d5f53495d 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-17 Ben Key <BKey1@tampabay.rr.com>
+ * nmake.defs: Made changes so that Emacs would link with
+ WinMM.lib. This change was required for my addition of a Windows
+ compatible implementation of play-sound-internal.
+ * gmake.defs: Made changes so that Emacs would link with
+ WinMM.lib. This change was required for my addition of a Windows
+ compatible implementation of play-sound-internal.
+
2002-09-03 Juanma Barranquero <lektu@terra.es> (tiny change)
* emacs.rc: Version updated to 21.3.50. From Peter Runestig
diff --git a/nt/gmake.defs b/nt/gmake.defs
index d75239d30c6..2235417aca4 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -166,6 +166,7 @@ MPR = -lmpr
SHELL32 = -lshell32
USER32 = -luser32
WSOCK32 = -lwsock32
+WINMM = -lwinmm
ifdef NOOPT
DEBUG_CFLAGS = -DEMACSDEBUG
diff --git a/nt/nmake.defs b/nt/nmake.defs
index 3c3e8b5bca2..e2bfd58fc57 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -123,6 +123,7 @@ MPR = mpr.lib
SHELL32 = shell32.lib
USER32 = user32.lib
WSOCK32 = wsock32.lib
+WINMM = winmm.lib
!ifdef NOOPT
DEBUG_CFLAGS = -DEMACSDEBUG