diff --git a/makefile b/makefile index b7e78ebc..f26bc118 100644 --- a/makefile +++ b/makefile @@ -751,6 +751,11 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin) endif ifeq (cygwin,$(OSTYPE)) LIBEXT = $(LIBEXTSAVE) + LIBPATH += /usr/lib/w32api + ifneq (,$(call find_lib,winmm)) + OS_CCDEFS += -DHAVE_WINMM + OS_LDFLAGS += -lwinmm + endif endif ifeq (,$(findstring HAVE_LIBSDL,$(VIDEO_CCDEFS))) $(info *** Info ***) diff --git a/sim_timer.c b/sim_timer.c index dc46d902..227399b7 100644 --- a/sim_timer.c +++ b/sim_timer.c @@ -88,6 +88,9 @@ #include "sim_defs.h" #include #include +#ifdef HAVE_WINMM +#include +#endif #define SIM_INTERNAL_CLK (SIM_NTIMERS+(1<<30)) #define SIM_INTERNAL_UNIT sim_internal_timer_unit @@ -462,7 +465,7 @@ return 0; } #endif /* CLOCK_REALTIME */ -#elif defined (_WIN32) +#elif defined (_WIN32) || defined(HAVE_WINMM) /* Win32 routines */