From f0889fd981c842d545ba7694733e206086dc8dcc Mon Sep 17 00:00:00 2001 From: SarahW Date: Sun, 11 Feb 2018 15:45:41 +0000 Subject: [PATCH] Fix automake include path for Windows. --- src/Makefile.am | 2 +- src/Makefile.in | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9f2ca5f..7a08697 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,7 +104,7 @@ pcem_CXXFLAGS += -DPCEM_RENDER_WITH_TIMER -DPCEM_RENDER_TIMER_LOOP endif if OS_WINDOWS -#DEFAULT_INCLUDES = -iquote . +DEFAULT_INCLUDES = -iquote . pcem_SOURCES += cdrom-ioctl.c wx-sdl2-display-win.c pcem_LDADD += wx.res endif diff --git a/src/Makefile.in b/src/Makefile.in index 822176b..733dfff 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -118,8 +118,7 @@ bin_PROGRAMS = pcem$(EXEEXT) @OS_MACOSX_TRUE@am__append_14 = cdrom-ioctl-osx.c wx-sdl2-display.c @OS_MACOSX_TRUE@am__append_15 = -DPCEM_RENDER_WITH_TIMER -DPCEM_RENDER_TIMER_LOOP @OS_MACOSX_TRUE@am__append_16 = -DPCEM_RENDER_WITH_TIMER -DPCEM_RENDER_TIMER_LOOP - -#DEFAULT_INCLUDES = -iquote . +DEFAULT_INCLUDES = -I.@am__isrc@ @OS_WINDOWS_TRUE@am__append_17 = cdrom-ioctl.c wx-sdl2-display-win.c @OS_WINDOWS_TRUE@am__append_18 = wx.res @HAS_OFF64T_FALSE@am__append_19 = -Doff64_t=off_t -Dfopen64=fopen -Dfseeko64=fseek -Dftello64=ftell @@ -371,7 +370,6 @@ AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f @@ -623,6 +621,7 @@ pcem_CFLAGS = $(subst -fpermissive,,$(shell wx-config --cxxflags) \ pcem_CXXFLAGS = $(shell wx-config --cxxflags) $(shell sdl2-config \ --cflags) $(am__append_10) $(am__append_16) $(am__append_21) pcem_LDADD = @LIBS@ $(am__append_3) $(am__append_12) $(am__append_18) +@OS_WINDOWS_TRUE@DEFAULT_INCLUDES = -iquote . all: all-am .SUFFIXES: