Commit a427785c6df6b47ba94582e79650bf142e8b28e8

Authored by Perry Werneck
1 parent a5386413
Exists in develop

Debugging runtime builder.

Showing 2 changed files with 19 additions and 5 deletions   Show diff stats
src/include/config.h.in
@@ -24,12 +24,12 @@ @@ -24,12 +24,12 @@
24 /* do we have malloc.h? */ 24 /* do we have malloc.h? */
25 #undef HAVE_MALLOC_H 25 #undef HAVE_MALLOC_H
26 26
27 -/* Define to 1 if you have the <memory.h> header file. */  
28 -#undef HAVE_MEMORY_H  
29 -  
30 /* Define to 1 if you have the <stdint.h> header file. */ 27 /* Define to 1 if you have the <stdint.h> header file. */
31 #undef HAVE_STDINT_H 28 #undef HAVE_STDINT_H
32 29
  30 +/* Define to 1 if you have the <stdio.h> header file. */
  31 +#undef HAVE_STDIO_H
  32 +
33 /* Define to 1 if you have the <stdlib.h> header file. */ 33 /* Define to 1 if you have the <stdlib.h> header file. */
34 #undef HAVE_STDLIB_H 34 #undef HAVE_STDLIB_H
35 35
@@ -99,7 +99,9 @@ @@ -99,7 +99,9 @@
99 /* The product name */ 99 /* The product name */
100 #undef PRODUCT_NAME 100 #undef PRODUCT_NAME
101 101
102 -/* Define to 1 if you have the ANSI C header files. */ 102 +/* Define to 1 if all of the C90 standard headers exist (not just the ones
  103 + required in a freestanding environment). This macro is provided for
  104 + backward compatibility; new code need not use it. */
103 #undef STDC_HEADERS 105 #undef STDC_HEADERS
104 106
105 /* Version number of package */ 107 /* Version number of package */
win/makeruntime.sh.in
@@ -32,10 +32,16 @@ prefix=&quot;@prefix@&quot; @@ -32,10 +32,16 @@ prefix=&quot;@prefix@&quot;
32 imgdir=.build 32 imgdir=.build
33 bindir="${imgdir}/bin" 33 bindir="${imgdir}/bin"
34 34
  35 +if [ -z "${WIN_ROOT}" ]; then
  36 + WIN_ROOT="/c/Windows"
  37 +fi
  38 +
35 export LANG=C 39 export LANG=C
36 40
37 install_bin() { 41 install_bin() {
38 42
  43 + mkdir -p "${bindir}"
  44 +
39 AGAIN=1 45 AGAIN=1
40 until [ $AGAIN = 0 ]; do 46 until [ $AGAIN = 0 ]; do
41 47
@@ -102,6 +108,7 @@ install_bin() { @@ -102,6 +108,7 @@ install_bin() {
102 winspool.drv 108 winspool.drv
103 ntdll 109 ntdll
104 winhttp 110 winhttp
  111 + hid
105 " 112 "
106 113
107 # Remove system DLLs from list 114 # Remove system DLLs from list
@@ -135,9 +142,14 @@ install_bin() { @@ -135,9 +142,14 @@ install_bin() {
135 exit -1 142 exit -1
136 fi 143 fi
137 144
  145 + elif [ -e "${WIN_ROOT}/System32/${FILENAME}" ]; then
  146 +
  147 + echo "Ignoring ${WIN_ROOT}/System32/${FILENAME}"
  148 +
138 else 149 else
139 150
140 - echo "Can't find ${FILENAME}" 151 + echo "Can't find ${prefix}/bin/${FILENAME} or ${WIN_ROOT}/System32/${FILENAME}"
  152 + find "${prefix}" -iname "${FILENAME}"
141 exit -1 153 exit -1
142 154
143 fi 155 fi