Merge e9d886c36c into e1236e1b62

build.sh

@@ -17,6 +17,7 @@ debug_opts='--enable-debug'
 user_opts=''
 build_cflags='-O0 -g'
 job_count='4'
+make_tool='make'
 
 while [ ! -z ${1} ]
 do
@@ -65,6 +66,12 @@ case "$(uname -s)" in # adjust compilation option based on platform
         sys_opts='--python=python3 --disable-cocoa --disable-opengl --disable-fortify-source'
         postbuild='package_windows' # set the above function to be called after build
         ;;
+    Free*|Open*|Net*|DragonFly*|BSD)
+        echo 'Compiling for BSD…'
+        sys_cflags='-march=native'
+        sys_opts='--disable-kvm --disable-xen --disable-werror --enable-bsd-user'
+        make_tool='gmake'
+        ;;
     *)
         echo "could not detect OS $(uname -s), aborting" >&2
         exit -1
@@ -136,6 +143,6 @@ set -x # Print commands from now on
     --disable-blobs \
     ${user_opts}
 
-time make -j"${job_count}" subdir-i386-softmmu 2>&1 | tee build.log
+time "${make_tool}" -j"${job_count}" subdir-i386-softmmu 2>&1 | tee build.log
 
 ${postbuild} # call post build functions

hw/xbox/nv2a/gl/Makefile.objs

@@ -1,4 +1,8 @@
 obj-y += gloffscreen_common.o
 obj-$(CONFIG_WIN32) += gloffscreen_wgl.o
-obj-$(CONFIG_DARWIN) += gloffscreen_cgl.o
 obj-$(CONFIG_LINUX) += gloffscreen_glx.o
+obj-$(CONFIG_DARWIN) += gloffscreen_cgl.o
+ifneq ($(CONFIG_DARWIN),y)
+obj-$(CONFIG_BSD) += gloffscreen_glx.o
+endif
+