Commit cbdcb321 authored by Rye Mutt's avatar Rye Mutt 🍞

Get windows to build again

parent 7d9ed7eb
......@@ -22,7 +22,6 @@ top="$(pwd)"
stage="$(pwd)/stage"
DULLAHAN_DIR="$top/dullahan"
DULLAHAN_SOURCE_DIR="$DULLAHAN_DIR/src"
# Load autobuild provided shell functions and variables
source_environment_tempfile="$stage/source_environment.sh"
......@@ -37,60 +36,54 @@ pushd "$DULLAHAN_DIR"
load_vsvars
# remove old project cruft
rm -rf "$DULLAHAN_DIR/build"
mkdir "$DULLAHAN_DIR/build"
cd "$DULLAHAN_DIR/build"
# create Visual Studio project files
cmake .. \
-G "$AUTOBUILD_WIN_CMAKE_GEN" -A${AUTOBUILD_WIN_VSPLATFORM} \
-DCEF_INCLUDE_DIR="$(cygpath -w "$stage/packages/include/cef/include")" \
-DCEF_LIB_DIR="$(cygpath -w "$stage/packages/lib")" \
-DCEF_BIN_DIR="$(cygpath -w "$stage/packages/bin")" \
-DCEF_RESOURCE_DIR="$(cygpath -w "$stage/packages/resources")" \
-DCMAKE_CXX_FLAGS="/std:c++17 /Zc:wchar_t /EHsc"
# populate version_file (after CMake runs)
cl \
/Fo"$(cygpath -w "$stage/version.obj")" \
/Fe"$(cygpath -w "$stage/version.exe")" \
/I "$(cygpath -w "$stage/packages/include/cef")" \
/I "$(cygpath -w "$top/dullahan/src")" \
"$(cygpath -w "$top/version.cpp")"
"$stage/version.exe" > "$stage/version.txt"
rm "$stage"/version.{obj,exe}
# build individual projects but not examples
build_sln "dullahan.sln" "Release" "$AUTOBUILD_WIN_VSPLATFORM" dullahan
build_sln "dullahan.sln" "Release" "$AUTOBUILD_WIN_VSPLATFORM" dullahan_host
# prepare the staging dirs
cd ..
mkdir -p "$stage/include/cef"
mkdir -p "$stage/lib/release"
mkdir -p "$stage/bin/release"
mkdir -p "$stage/resources"
mkdir -p "$stage/LICENSES"
# Dullahan files
cp "$DULLAHAN_SOURCE_DIR/dullahan.h" "$stage/include/cef/"
cp "$DULLAHAN_SOURCE_DIR/dullahan_version.h" "$stage/include/cef/"
cp "$DULLAHAN_DIR/build/Release/dullahan.lib" "$stage/lib/release/"
cp "$DULLAHAN_DIR/build/Release/dullahan_host.exe" "$stage/bin/release/"
# CEF libraries
cp "$stage/packages/lib/Release/libcef.lib" "$stage/lib/release"
cp "$stage/packages/lib/Release/libcef_dll_wrapper.lib" "$stage/lib/release"
# CEF run time binaries
cp -R "$stage/packages/bin/release/"* "$stage/bin/release/"
# CEF resources
cp -R "$stage/packages/resources/"* "$stage/resources/"
# licenses
cp "$DULLAHAN_DIR/CEF_LICENSE.txt" "$stage/LICENSES"
cp "$DULLAHAN_DIR/LICENSE.txt" "$stage/LICENSES"
BUILD_FOLDER="build${AUTOBUILD_ADDRSIZE}"
rm -rf "${BUILD_FOLDER}"
mkdir -p "${BUILD_FOLDER}"
pushd ${BUILD_FOLDER}
# create Visual Studio project files
cmake .. \
-G "$AUTOBUILD_WIN_CMAKE_GEN" -A${AUTOBUILD_WIN_VSPLATFORM} \
-DCEF_INCLUDE_DIR="$(cygpath -w "$stage/packages/include/cef/include")" \
-DCEF_LIB_DIR="$(cygpath -w "$stage/packages/lib")" \
-DCEF_BIN_DIR="$(cygpath -w "$stage/packages/bin")" \
-DCEF_RESOURCE_DIR="$(cygpath -w "$stage/packages/resources")" \
-DCMAKE_CXX_FLAGS="/std:c++17 /Zc:wchar_t /EHsc"
# populate version_file (after CMake runs)
cl \
/Fo"$(cygpath -w "$stage/version.obj")" \
/Fe"$(cygpath -w "$stage/version.exe")" \
/I "$(cygpath -w "$stage/packages/include/cef")" \
/I "$(cygpath -w "$top/dullahan/src")" \
"$(cygpath -w "$top/version.cpp")"
"$stage/version.exe" > "$stage/version.txt"
rm "$stage"/version.{obj,exe}
# build individual projects but not examples
cmake --build . --config Release --target dullahan
cmake --build . --config Release --target dullahan_host
# prepare the staging dirs
mkdir -p "$stage/include/cef"
mkdir -p "$stage/lib/release"
mkdir -p "$stage/bin/release"
mkdir -p "$stage/resources"
mkdir -p "$stage/LICENSES"
# Dullahan files
cp "Release/dullahan.lib" "$stage/lib/release/"
cp "Release/dullahan_host.exe" "$stage/bin/release/"
# CEF libraries
cp "$stage/packages/lib/Release/libcef.lib" "$stage/lib/release"
cp "$stage/packages/lib/Release/libcef_dll_wrapper.lib" "$stage/lib/release"
# CEF run time binaries
cp -R "$stage/packages/bin/release/"* "$stage/bin/release/"
# CEF resources
cp -R "$stage/packages/resources/"* "$stage/resources/"
popd
;;
darwin*)
# remove old project cruft
......@@ -98,7 +91,6 @@ pushd "$DULLAHAN_DIR"
rm -rf "${BUILD_FOLDER}"
mkdir -p "${BUILD_FOLDER}"
pushd ${BUILD_FOLDER}
# create project file
cmake .. -G Xcode \
-DCMAKE_OSX_ARCHITECTURES="x86_64" \
......@@ -135,17 +127,20 @@ pushd "$DULLAHAN_DIR"
cp -R "Release/DullahanHelper.app" "$stage/lib/release/DullahanHelper (Plugin).app"
mv "$stage/lib/release/DullahanHelper (Plugin).app/Contents/MacOS/DullahanHelper" "$stage/lib/release/DullahanHelper (Plugin).app/Contents/MacOS/DullahanHelper (Plugin)"
cp "$DULLAHAN_SOURCE_DIR/dullahan.h" "$stage/include/cef/"
cp "$DULLAHAN_SOURCE_DIR/dullahan_version.h" "$stage/include/cef/"
cp "$stage/packages/lib/release/libcef_dll_wrapper.a" "$stage/lib/release"
cp -R "$stage/packages/bin/release/Chromium Embedded Framework.framework" "$stage/lib/release"
cp "$DULLAHAN_DIR/CEF_LICENSE.txt" "$stage/LICENSES"
cp "$DULLAHAN_DIR/LICENSE.txt" "$stage/LICENSES"
popd
;;
linux*)
echo "This project is not currently supported for $AUTOBUILD_PLATFORM" 1>&2 ; exit 1
;;
esac
# Dullahan header files
cp "src/dullahan.h" "$stage/include/cef/"
cp "src/dullahan_version.h" "$stage/include/cef/"
# licenses
cp "CEF_LICENSE.txt" "$stage/LICENSES"
cp "LICENSE.txt" "$stage/LICENSES"
popd
......@@ -129,7 +129,6 @@ void app::init_dullahan()
settings.cache_path = ".\\webcube_cache";
settings.cookies_enabled = true;
settings.disable_gpu = false;
settings.disable_network_service = false;
settings.disable_web_security = false;
settings.file_access_from_file_urls = false;
settings.flash_enabled = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment