diff --git a/SheepShaver/src/Windows/Makefile.in b/SheepShaver/src/Windows/Makefile.in index 7dcabb1f..fed312d8 100755 --- a/SheepShaver/src/Windows/Makefile.in +++ b/SheepShaver/src/Windows/Makefile.in @@ -38,6 +38,7 @@ CXXFLAGS = @CXXFLAGS@ $(SDL_CFLAGS) CPPFLAGS = @CPPFLAGS@ -I../include -I. -I../slirp DEFS = @DEFS@ LDFLAGS = @LDFLAGS@ -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic +#TODO remove pthread part of that if irrelevant LIBS = @LIBS@ -lws2_32 -lwsock32 -liphlpapi CPUSRCS = @CPUSRCS@ PERL = @PERL@ diff --git a/SheepShaver/src/Windows/build_on_msys.py b/SheepShaver/src/Windows/build_on_msys.py index 57e89b94..08933a54 100644 --- a/SheepShaver/src/Windows/build_on_msys.py +++ b/SheepShaver/src/Windows/build_on_msys.py @@ -1,5 +1,5 @@ # -# A python 2.7 script to fetch all dependencies and build Sheepshaver using MSYS +# A python 2.7 script to fetch all dependencies and build Sheepshaver using MSYS / mingw # import argparse import glob @@ -12,9 +12,11 @@ import zipfile import sys from contextlib import contextmanager import datetime - import shutil +# TODO keep track of the values for these flags used for the previous compile and +# redo the macemu configures if they change + MACEMU_CFLAGS = "-mwin32" # TODO check if __STRICT_ANSI__ is still required since we switched to gnu++11 MACEMU_CXXFLAGS = "-mwin32 -std=gnu++11" @@ -563,7 +565,7 @@ def main(): if num_threads > 1: make_args.append("-j%d" % num_threads) - log("Install to %s" % options.install_to_dir) + log("Will install to %s" % options.install_to_dir) install(make_args, options.show_build_environment, install_to_dir=options.install_to_dir)