diff --git a/BasiliskII/src/Windows/Makefile.in b/BasiliskII/src/Windows/Makefile.in index 75237c21..272ce070 100755 --- a/BasiliskII/src/Windows/Makefile.in +++ b/BasiliskII/src/Windows/Makefile.in @@ -16,6 +16,7 @@ KEYCODES = ../SDL/keycodes DESTDIR = LN_S = @LN_S@ +WINDRES = @WINDRES@ CC = @CC@ CXX = @CXX@ CFLAGS = @CFLAGS@ @@ -111,7 +112,7 @@ $(OBJ_DIR)/%.o : %.s # Windows resources $(OBJ_DIR)/%.o: %.rc - windres --include-dir ../Windows -i $< -o $@ + $(WINDRES) --include-dir ../Windows -i $< -o $@ $(OBJ_DIR)/build68k.exe: $(OBJ_DIR)/build68k.ho $(HOST_CC) $(HOST_LDFLAGS) -o $@ $< $(OBJ_DIR)/gencpu.exe: $(OBJ_DIR)/gencpu.ho $(OBJ_DIR)/readcpu.ho $(OBJ_DIR)/cpudefs.ho diff --git a/BasiliskII/src/Windows/configure.ac b/BasiliskII/src/Windows/configure.ac index 88cc7766..0a8ea5d3 100755 --- a/BasiliskII/src/Windows/configure.ac +++ b/BasiliskII/src/Windows/configure.ac @@ -65,6 +65,7 @@ AC_PROG_CXX AC_PROG_MAKE_SET AC_PROG_EGREP AC_PROG_LN_S +AC_CHECK_TOOL(WINDRES, windres) dnl We use 64-bit file size support if possible. AC_SYS_LARGEFILE @@ -473,7 +474,7 @@ CPUINCLUDES="-I../uae_cpu" CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cpp ../uae_cpu/readcpu.cpp $FPUSRCS cpustbl.cpp cpudefs.cpp $CPUSRCS $JITSRCS" dnl We really want SDL for now -AC_PATH_PROG(sdl_config, "sdl-config", [AC_MSG_ERROR([Sorry, you currently need SDL for this port])]) +AC_CHECK_TOOL(sdl_config, sdl-config, [AC_MSG_ERROR([Sorry, you currently need SDL for this port])]) sdl_cflags=`$sdl_config --cflags` sdl_libs=`$sdl_config --libs` CFLAGS="$CFLAGS $sdl_cflags"