7d9dec05dd
Use windres to build the resource files and include them in the dll and executables. Since we need a different resource for the console/gui version move the creation of the python3w.exe file from the PKGBUILD into the Makefile. With a bit of luck this should allow one to opt into the new long paths feature on Windows 10, like with the official builds. (no Windows 10 here, can't test)
71 lines
3.1 KiB
Diff
71 lines
3.1 KiB
Diff
--- Python-3.6.4/Makefile.pre.in.orig 2018-01-22 20:02:36.256958400 +0100
|
|
+++ Python-3.6.4/Makefile.pre.in 2018-01-22 20:14:58.314401700 +0100
|
|
@@ -236,6 +236,7 @@
|
|
|
|
PYTHON= python$(EXE)
|
|
BUILDPYTHON= python$(BUILDEXE)
|
|
+BUILDPYTHONW= pythonw$(BUILDEXE)
|
|
|
|
PYTHON_FOR_REGEN=@PYTHON_FOR_REGEN@
|
|
UPDATE_FILE=@PYTHON_FOR_REGEN@ $(srcdir)/Tools/scripts/update_file.py
|
|
@@ -448,7 +450,7 @@
|
|
|
|
# Default target
|
|
all: @DEF_MAKE_ALL_RULE@
|
|
-build_all: check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks \
|
|
+build_all: check-clean-src $(BUILDPYTHON) $(BUILDPYTHONW) oldsharedmods sharedmods gdbhooks \
|
|
Programs/_testembed python-config
|
|
|
|
# Check that the source is clean when building out of source.
|
|
@@ -551,9 +553,27 @@
|
|
clinic: check-clean-src $(BUILDPYTHON) $(srcdir)/Modules/_blake2/blake2s_impl.c
|
|
$(RUNSHARED) $(PYTHON_FOR_BUILD) ./Tools/clinic/clinic.py --make
|
|
|
|
+pythonnt_rc.h:
|
|
+ # FIXME: FIELD3 not set
|
|
+ @echo '#define FIELD3 0' > $@
|
|
+ @echo '#define MS_DLL_ID "$(VERSION)"' >> $@
|
|
+ @echo '#define PYTHON_DLL_NAME "$(DLLLIBRARY)"' >> $@
|
|
+
|
|
+python_exe.o: pythonnt_rc.h $(srcdir)/PC/python_exe.rc
|
|
+ windres -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_exe.rc $@
|
|
+
|
|
+pythonw_exe.o: pythonnt_rc.h $(srcdir)/PC/pythonw_exe.rc
|
|
+ windres -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/pythonw_exe.rc $@
|
|
+
|
|
+python_nt.o: pythonnt_rc.h $(srcdir)/PC/python_nt.rc
|
|
+ windres -I$(srcdir)/Include -I$(srcdir)/PC -I. $(srcdir)/PC/python_nt.rc $@
|
|
+
|
|
+$(BUILDPYTHONW): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) pythonw_exe.o
|
|
+ $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -mwindows -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) pythonw_exe.o
|
|
+
|
|
# Build the interpreter
|
|
-$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
|
|
- $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
|
|
+$(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) python_exe.o
|
|
+ $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) python_exe.o
|
|
|
|
platform: $(BUILDPYTHON) pybuilddir.txt
|
|
$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform
|
|
@@ -662,10 +682,10 @@
|
|
|
|
# This rule builds the Python DLL and import library if configured
|
|
# for a shared core library; otherwise, this rule is a noop.
|
|
-$(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS)
|
|
+$(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) python_nt.o
|
|
if test -n "$(DLLLIBRARY)"; then \
|
|
$(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \
|
|
- $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \
|
|
+ $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) python_nt.o; \
|
|
else true; \
|
|
fi
|
|
|
|
@@ -1162,6 +1183,7 @@
|
|
done
|
|
if test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \
|
|
$(INSTALL_PROGRAM) $(BUILDPYTHON) $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
|
|
+ $(INSTALL_PROGRAM) $(BUILDPYTHONW) $(DESTDIR)$(BINDIR)/python3w$(EXE); \
|
|
else \
|
|
$(INSTALL_PROGRAM) $(STRIPFLAG) Mac/pythonw $(DESTDIR)$(BINDIR)/python$(LDVERSION)$(EXE); \
|
|
fi
|