Cross-Platform build scripts for audio plugins
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

58 lines
2.8KB

  1. diff --git a/Makefile.pre.in b/Makefile.pre.in
  2. index e2143a2..4ee959f 100644
  3. --- a/Makefile.pre.in
  4. +++ b/Makefile.pre.in
  5. @@ -730,26 +730,26 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
  6. Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile
  7. -Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
  8. +Programs/_freeze_importlib$(EXE): Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
  9. $(LINKCC) $(PY_CORE_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS)
  10. .PHONY: regen-importlib
  11. -regen-importlib: Programs/_freeze_importlib
  12. +regen-importlib: Programs/_freeze_importlib$(EXE)
  13. # Regenerate Python/importlib_external.h
  14. # from Lib/importlib/_bootstrap_external.py using _freeze_importlib
  15. - ./Programs/_freeze_importlib importlib._bootstrap_external \
  16. + ./Programs/_freeze_importlib$(EXE) importlib._bootstrap_external \
  17. $(srcdir)/Lib/importlib/_bootstrap_external.py \
  18. $(srcdir)/Python/importlib_external.h.new
  19. $(UPDATE_FILE) $(srcdir)/Python/importlib_external.h $(srcdir)/Python/importlib_external.h.new
  20. # Regenerate Python/importlib.h from Lib/importlib/_bootstrap.py
  21. # using _freeze_importlib
  22. - ./Programs/_freeze_importlib importlib._bootstrap \
  23. + ./Programs/_freeze_importlib$(EXE) importlib._bootstrap \
  24. $(srcdir)/Lib/importlib/_bootstrap.py \
  25. $(srcdir)/Python/importlib.h.new
  26. $(UPDATE_FILE) $(srcdir)/Python/importlib.h $(srcdir)/Python/importlib.h.new
  27. # Regenerate Python/importlib_zipimport.h from Lib/zipimport.py
  28. # using _freeze_importlib
  29. - ./Programs/_freeze_importlib zipimport \
  30. + ./Programs/_freeze_importlib$(EXE) zipimport \
  31. $(srcdir)/Lib/zipimport.py \
  32. $(srcdir)/Python/importlib_zipimport.h.new
  33. $(UPDATE_FILE) $(srcdir)/Python/importlib_zipimport.h $(srcdir)/Python/importlib_zipimport.h.new
  34. @@ -1807,7 +1807,7 @@ clean: pycremoval
  35. find build -name '*.py[co]' -exec rm -f {} ';' || true
  36. -rm -f pybuilddir.txt
  37. -rm -f Lib/lib2to3/*Grammar*.pickle
  38. - -rm -f Programs/_testembed Programs/_freeze_importlib
  39. + -rm -f Programs/_testembed Programs/_freeze_importlib$(EXE)
  40. -find build -type f -a ! -name '*.gc??' -exec rm -f {} ';'
  41. -rm -f Include/pydtrace_probes.h
  42. -rm -f profile-gen-stamp
  43. diff -Naur Python-3.8.0-orig/Programs/_freeze_importlib.c Python-3.8.0/Programs/_freeze_importlib.c
  44. --- Python-3.8.0-orig/Programs/_freeze_importlib.c 2019-10-14 16:34:47.000000000 +0300
  45. +++ Python-3.8.0/Programs/_freeze_importlib.c 2019-10-22 10:03:31.757808700 +0300
  46. @@ -20,7 +20,7 @@
  47. {0, 0, 0} /* sentinel */
  48. };
  49. -#ifndef MS_WINDOWS
  50. +#ifndef _MSC_VER
  51. /* On Windows, this links with the regular pythonXY.dll, so this variable comes
  52. from frozen.obj. In the Makefile, frozen.o is not linked into this executable,
  53. so we define the variable here. */