Browse Source

Verified win64 builds

dirkson 4 months ago
parent
commit
4304a8ffde
2 changed files with 5 additions and 3 deletions
  1. 3
    1
      build
  2. 2
    2
      scripts/win64cross.txt

+ 3
- 1
build View File

@@ -105,11 +105,13 @@ case "$1" in
105 105
 -d)
106 106
 	DIR=debug
107 107
 	BLD=debug
108
+	MESONOPTS="--werror"
108 109
 ;;
109 110
 -a)
110 111
 	DIR=debug
111 112
 	BLD=debug
112 113
 	MESONOPTS=-Db_sanitize=address
114
+	MESONOPTS="--werror"
113 115
 ;;
114 116
 -r)
115 117
 	DIR=release
@@ -214,7 +216,7 @@ if [ ! -d "$BUILDDIR/$DIR" ]; then
214 216
 	export CC="$COMPILER"
215 217
 	#Run meson if required
216 218
 	mkdir $BUILDDIR/$DIR
217
-	meson $BUILDDIR/$DIR $MESONOPTS --werror --buildtype $BLD
219
+	meson $BUILDDIR/$DIR $MESONOPTS --buildtype $BLD
218 220
 	if [ ! $? -eq 0 ]; then
219 221
 		#Generally an error here means we need to clean before the next run
220 222
 		#TODO - We should copy out the log

+ 2
- 2
scripts/win64cross.txt View File

@@ -5,12 +5,12 @@ cpp = 'x86_64-w64-mingw32.static-g++'
5 5
 ar = 'x86_64-w64-mingw32.static-ar'
6 6
 strip = 'x86_64-w64-mingw32.static-strip'
7 7
 pkgconfig = 'x86_64-w64-mingw32.static-pkg-config'
8
-exe_wrapper = 'wine' # A command used to run generated executables.
8
+exe_wrapper = 'true' # A command used to run generated executables.
9 9
 
10 10
 [properties]
11 11
 has_function_printf = true
12 12
 c_args = ['-DBOKSI_BUILD_WIN']
13
-c_link_args = ['']
13
+#c_link_args = ['']
14 14
 needs_exe_wrapper = true
15 15
 
16 16
 [host_machine]

Loading…
Cancel
Save