Incorporate fix from wxWidgetsTemplate

+ Static linking (see commit fa08583ac3a0cc64f7e5979659838e0e0290f405 on wxWidgetsTemplate)

Author: Ravbug

linux-pkg.sh

@@ -13,29 +13,29 @@ mkdir -p $appimagepath
 # copy necessary pieces
 cp $build_dir/$name $appimagepath	# executable
 cp $src/wxlin.xpm $appimagepath		# icon
-# copy libraries
-cp $lib_dir/libwx_baseu-3.1.so $appimagepath
-cp $lib_dir/libwx_baseu-3.1.so.3 $appimagepath
-cp $lib_dir/libwx_baseu-3.1.so.3.0.0 $appimagepath
-cp $lib_dir/libwx_baseu_net-3.1.so $appimagepath
-cp $lib_dir/libwx_baseu_net-3.1.so.3 $appimagepath
-cp $lib_dir/libwx_baseu_net-3.1.so.3.0.0 $appimagepath
-cp $lib_dir/libwx_baseu_xml-3.1.so $appimagepath
-cp $lib_dir/libwx_baseu_xml-3.1.so.3 $appimagepath
-cp $lib_dir/libwx_baseu_xml-3.1.so.3.0.0 $appimagepath
-cp $lib_dir/libwx_gtk3u_core-3.1.so $appimagepath
-cp $lib_dir/libwx_gtk3u_core-3.1.so.3 $appimagepath
-cp $lib_dir/libwx_gtk3u_core-3.1.so.3.0.0 $appimagepath
-cp $lib_dir/libwx_gtk3u_html-3.1.so $appimagepath
-cp $lib_dir/libwx_gtk3u_html-3.1.so.3 $appimagepath
-cp $lib_dir/libwx_gtk3u_html-3.1.so.3.0.0 $appimagepath
-cp $lib_dir/libwx_gtk3u_qa-3.1.so $appimagepath
-cp $lib_dir/libwx_gtk3u_qa-3.1.so.3 $appimagepath
-cp $lib_dir/libwx_gtk3u_qa-3.1.so.3.0.0 $appimagepath
-cp $lib_dir/libwx_gtk3u_xrc-3.1.so $appimagepath
-cp $lib_dir/libwx_gtk3u_xrc-3.1.so.3 $appimagepath
-cp $lib_dir/libwx_gtk3u_xrc-3.1.so.3.0.0 $appimagepath
 
+# copy dynamic libraries (uncomment the following if using dynamic wx build)
+#cp $lib_dir/libwx_baseu-3.1.so $appimagepath
+#cp $lib_dir/libwx_baseu-3.1.so.3 $appimagepath
+#cp $lib_dir/libwx_baseu-3.1.so.3.0.0 $appimagepath
+#cp $lib_dir/libwx_baseu_net-3.1.so $appimagepath
+#cp $lib_dir/libwx_baseu_net-3.1.so.3 $appimagepath
+#cp $lib_dir/libwx_baseu_net-3.1.so.3.0.0 $appimagepath
+#cp $lib_dir/libwx_baseu_xml-3.1.so $appimagepath
+#cp $lib_dir/libwx_baseu_xml-3.1.so.3 $appimagepath
+#cp $lib_dir/libwx_baseu_xml-3.1.so.3.0.0 $appimagepath
+#cp $lib_dir/libwx_gtk3u_core-3.1.so $appimagepath
+#cp $lib_dir/libwx_gtk3u_core-3.1.so.3 $appimagepath
+#cp $lib_dir/libwx_gtk3u_core-3.1.so.3.0.0 $appimagepath
+#cp $lib_dir/libwx_gtk3u_html-3.1.so $appimagepath
+#cp $lib_dir/libwx_gtk3u_html-3.1.so.3 $appimagepath
+#cp $lib_dir/libwx_gtk3u_html-3.1.so.3.0.0 $appimagepath
+#cp $lib_dir/libwx_gtk3u_qa-3.1.so $appimagepath
+#cp $lib_dir/libwx_gtk3u_qa-3.1.so.3 $appimagepath
+#cp $lib_dir/libwx_gtk3u_qa-3.1.so.3.0.0 $appimagepath
+#cp $lib_dir/libwx_gtk3u_xrc-3.1.so $appimagepath
+#cp $lib_dir/libwx_gtk3u_xrc-3.1.so.3 $appimagepath
+#cp $lib_dir/libwx_gtk3u_xrc-3.1.so.3.0.0 $appimagepath
 
 # generate AppImage pieces
 printf "#!/bin/sh\ncd \"\$(dirname \"\$0\")\"; echo 'starting!'; LD_LIBRARY_PATH=. ./$name" > $appimagepath/AppRun

makefile

@@ -1,6 +1,6 @@
 # flags needed to build the target (compiler, target name, and compiler flags)
 CC = g++
-CFLAGS := `wxWidgets/build/linux/wx-config --cppflags` `wxWidgets/build/linux/wx-config --libs` -Wl,-rpath,wxWidgets/build/linux/lib/
+CFLAGS := `wxWidgets/build/linux/wx-config --cxxflags --libs` -Wl,-rpath,wxWidgets/build/linux/lib/
 target = UnityHubNative
 
 # location of source files
@@ -31,7 +31,7 @@ all: $(lib_build_path)/$(lib_file_detect)
 
 # link the object files together into the executable
 $(build_dir)/$(target): $(objects)
-	$(CC) $(CFLAGS) $(mode) -o $@ $^
+	$(CC) $(mode) -o $@ $^ $(CFLAGS)
 
 # compile object files from source files
 # This only looks at changes in the .cpp files, so if headers are modified, a rebuild is needed.

setup-linux.sh

@@ -36,7 +36,7 @@ cd build/linux;
 echoStatus "configure" "Running configure script"
 # run the configure script
 success=0;
-../../configure --enable-unicode --enable-debug && success=1
+../../configure --enable-unicode --disable-shared && success=1
 
 # check success
 if [ $success = 0 ]; then