From bbd3070ca35404d550077d096babcb989a2faf03 Mon Sep 17 00:00:00 2001 From: Chris Elliott Date: Wed, 3 Sep 2003 14:25:13 +0000 Subject: [PATCH] fix makefile for digitalmars to build joytest sample git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- lib/_sc/winmm32_sc.def | 12 ++++++++++++ src/makesc.env | 3 ++- src/msw/makefile.sc | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 lib/_sc/winmm32_sc.def diff --git a/lib/_sc/winmm32_sc.def b/lib/_sc/winmm32_sc.def new file mode 100644 index 0000000000..d19ccf55a1 --- /dev/null +++ b/lib/_sc/winmm32_sc.def @@ -0,0 +1,12 @@ +LIBRARY winmm +EXETYPE NT +SUBSYSTEM WINDOWS +EXPORTS + _WSACleanup@0 = WSACleanup + + _PlaySoundA@12 = PlaySoundA + _joyReleaseCapture@4 = joyReleaseCapture + _joySetCapture@16 = joySetCapture + _joyGetDevCapsA@12 = joyGetDevCapsA + _joyGetPos@8 = joyGetPos + _joyGetNumDevs@0 = joyGetNumDevs diff --git a/src/makesc.env b/src/makesc.env index dac29a2404..0f689b73a8 100644 --- a/src/makesc.env +++ b/src/makesc.env @@ -12,7 +12,8 @@ LIBDIR = $(WXDIR)\lib WXLIB = wx$(SC_SUFFIX).lib WINSOCKLIB = wsock32$(SC_SUFFIX) SHELLLIB = shell32$(SC_SUFFIX) -SUPPORTLIBS = png$(SC_SUFFIX) tiff$(SC_SUFFIX) jpeg$(SC_SUFFIX) zlib$(SC_SUFFIX) $(SHELLLIB) $(WINSOCKLIB) +WINMMLIB =winmm32$(SC_SUFFIX) +SUPPORTLIBS = png$(SC_SUFFIX) tiff$(SC_SUFFIX) jpeg$(SC_SUFFIX) zlib$(SC_SUFFIX) $(SHELLLIB) $(WINSOCKLIB) $(WINMMLIB) SRCSUFF = cpp OBJSUFF = obj diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc index 19e9a8dcea..bda12fc71c 100644 --- a/src/msw/makefile.sc +++ b/src/msw/makefile.sc @@ -340,6 +340,7 @@ MAKEARCHDIR: MAKELIBS: implib /s $(LIBDIR)\$(SHELLLIB) $(LIBDIR)\$(SC_SUFFIX)\$(SHELLLIB).def implib /s $(LIBDIR)\$(WINSOCKLIB) $(LIBDIR)\$(SC_SUFFIX)\$(WINSOCKLIB).def + implib /s $(LIBDIR)\$(WINMMLIB) $(LIBDIR)\$(SC_SUFFIX)\$(WINMMLIB).def $(LIBTARGET): $(OBJECTS) -del $(LIBTARGET)