diff -rNu chicken-4.4.0.old/chicken-install.rc chicken-4.4.0.new/chicken-install.rc
old
|
new
|
|
| 1 | 1 24 MOVEABLE PURE |
| 2 | BEGIN |
| 3 | "<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>\r\n" |
| 4 | "<assembly xmlns=""urn:schemas-microsoft-com:asm.v1"" manifestVersion=""1.0"">\r\n" |
| 5 | " <assemblyIdentity version=""1.0.0.0"" processorArchitecture=""*"" name=""chicken-install"" type=""win32""/>\r\n" |
| 6 | " <ms_asmv2:trustInfo xmlns:ms_asmv2=""urn:schemas-microsoft-com:asm.v2"">\r\n" |
| 7 | " <ms_asmv2:security>\r\n" |
| 8 | " <ms_asmv2:requestedPrivileges>\r\n" |
| 9 | " <ms_asmv2:requestedExecutionLevel level=""asInvoker"" uiAccess=""false""/>\r\n" |
| 10 | " </ms_asmv2:requestedPrivileges>\r\n" |
| 11 | " </ms_asmv2:security>\r\n" |
| 12 | " </ms_asmv2:trustInfo>\r\n" |
| 13 | "</assembly>\r\n" |
| 14 | END |
diff -rNu chicken-4.4.0.old/chicken-uninstall.rc chicken-4.4.0.new/chicken-uninstall.rc
old
|
new
|
|
| 1 | 1 24 MOVEABLE PURE |
| 2 | BEGIN |
| 3 | "<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>\r\n" |
| 4 | "<assembly xmlns=""urn:schemas-microsoft-com:asm.v1"" manifestVersion=""1.0"">\r\n" |
| 5 | " <assemblyIdentity version=""1.0.0.0"" processorArchitecture=""*"" name=""chicken-uninstall"" type=""win32""/>\r\n" |
| 6 | " <ms_asmv2:trustInfo xmlns:ms_asmv2=""urn:schemas-microsoft-com:asm.v2"">\r\n" |
| 7 | " <ms_asmv2:security>\r\n" |
| 8 | " <ms_asmv2:requestedPrivileges>\r\n" |
| 9 | " <ms_asmv2:requestedExecutionLevel level=""asInvoker"" uiAccess=""false""/>\r\n" |
| 10 | " </ms_asmv2:requestedPrivileges>\r\n" |
| 11 | " </ms_asmv2:security>\r\n" |
| 12 | " </ms_asmv2:trustInfo>\r\n" |
| 13 | "</assembly>\r\n" |
| 14 | END |
diff -rNu chicken-4.4.0.old/config.make chicken-4.4.0.new/config.make
old
|
new
|
|
29 | 29 | # Add additional C compiler options: |
30 | 30 | #C_COMPILER_OPTIMIZATION_OPTIONS=... |
31 | 31 | |
| 32 | # Use alternative resource compiler (for Win32 builds) |
| 33 | #RC_COMPILER= |
| 34 | |
32 | 35 | # Choose prefix to be added to installed programs: |
33 | 36 | #PROGRAM_PREFIX= |
34 | 37 | |
diff -rNu chicken-4.4.0.old/defaults.make chicken-4.4.0.new/defaults.make
old
|
new
|
|
96 | 96 | CXX_COMPILER ?= g++ |
97 | 97 | LIBRARIAN ?= ar |
98 | 98 | endif |
| 99 | ifdef WINDOWS |
| 100 | ifdef HOSTSYSTEM |
| 101 | RC_COMPILER ?= $(HOSTSYSTEM)-windres |
| 102 | else |
| 103 | RC_COMPILER ?= windres |
| 104 | endif |
| 105 | endif |
99 | 106 | LINKER ?= $(C_COMPILER) |
100 | 107 | ifdef WINDOWS_SHELL |
101 | 108 | REMOVE_COMMAND ?= del |
diff -rNu chicken-4.4.0.old/Makefile.cygwin chicken-4.4.0.new/Makefile.cygwin
old
|
new
|
|
44 | 44 | |
45 | 45 | C_COMPILER = gcc |
46 | 46 | CXX_COMPILER = g++ |
| 47 | RC_COMPILER = windres |
47 | 48 | LINKER = gcc |
48 | 49 | |
49 | 50 | |
diff -rNu chicken-4.4.0.old/Makefile.mingw chicken-4.4.0.new/Makefile.mingw
old
|
new
|
|
66 | 66 | endif |
67 | 67 | endif |
68 | 68 | C_COMPILER_SHARED_OPTIONS = -DPIC |
| 69 | RC_COMPILER ?= windres |
69 | 70 | LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared |
70 | 71 | LIBRARIES = -lm -lws2_32 |
71 | 72 | LINKER_OPTIONS = -Wl,--enable-auto-import |
diff -rNu chicken-4.4.0.old/rules.make chicken-4.4.0.new/rules.make
old
|
new
|
|
668 | 668 | $(C_COMPILER_STATIC_OPTIONS) \ |
669 | 669 | $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT) |
670 | 670 | |
| 671 | # resource objects |
| 672 | |
| 673 | chicken-install.rc$(O): chicken-install.rc |
| 674 | $(RC_COMPILER) $< $@ |
| 675 | chicken-uninstall.rc$(O): chicken-uninstall.rc |
| 676 | $(RC_COMPILER) $< $@ |
| 677 | |
671 | 678 | # libraries |
672 | 679 | |
673 | 680 | .PHONY: libs |
… |
… |
|
734 | 741 | $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< $(LINKER_OUTPUT) \ |
735 | 742 | $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES) |
736 | 743 | |
| 744 | ifneq ($(RC_COMPILER),) |
| 745 | $(CHICKEN_INSTALL_PROGRAM)$(EXE): chicken-install$(O) chicken-install.rc$(O) $(PRIMARY_LIBCHICKEN) |
| 746 | $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< chicken-install.rc$(O) $(LINKER_OUTPUT) \ |
| 747 | $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES) |
| 748 | else |
737 | 749 | $(CHICKEN_INSTALL_PROGRAM)$(EXE): chicken-install$(O) $(PRIMARY_LIBCHICKEN) |
738 | 750 | $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< $(LINKER_OUTPUT) \ |
739 | 751 | $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES) |
| 752 | endif |
| 753 | ifneq ($(RC_COMPILER),) |
| 754 | $(CHICKEN_UNINSTALL_PROGRAM)$(EXE): chicken-uninstall$(O) chicken-uninstall.rc$(O) $(PRIMARY_LIBCHICKEN) |
| 755 | $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< chicken-uninstall.rc$(O) $(LINKER_OUTPUT) \ |
| 756 | $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES) |
| 757 | else |
740 | 758 | $(CHICKEN_UNINSTALL_PROGRAM)$(EXE): chicken-uninstall$(O) $(PRIMARY_LIBCHICKEN) |
741 | 759 | $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< $(LINKER_OUTPUT) \ |
742 | 760 | $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES) |
| 761 | endif |
743 | 762 | $(CHICKEN_STATUS_PROGRAM)$(EXE): chicken-status$(O) $(PRIMARY_LIBCHICKEN) |
744 | 763 | $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< $(LINKER_OUTPUT) \ |
745 | 764 | $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES) |