mirror of
https://github.com/spice2x/spice2x.github.io.git
synced 2026-08-01 22:30:42 -07:00
update build script (#407)
## Link to GitHub Issue, if one exists n/a ## Description of change Create a "full" version of the archive with api and extra binaries. The normal archive remains in place with just src and stubs.
This commit is contained in:
@@ -49,7 +49,7 @@ BUILDDIR_64_RELEASE="./cmake-build-release-64"
|
|||||||
BUILDDIR_64_DEBUG="./cmake-build-debug-64"
|
BUILDDIR_64_DEBUG="./cmake-build-debug-64"
|
||||||
DEBUG=0
|
DEBUG=0
|
||||||
OUTDIR="./bin/spice2x"
|
OUTDIR="./bin/spice2x"
|
||||||
OUTDIR_EXTRAS="./bin/spice2x_extras"
|
OUTDIR_EXTRAS="./bin/spice2x/extras"
|
||||||
|
|
||||||
# disabled UPX since it tends to falsely trigger malware detection
|
# disabled UPX since it tends to falsely trigger malware detection
|
||||||
UPX_ENABLE=0
|
UPX_ENABLE=0
|
||||||
@@ -60,8 +60,8 @@ INCLUDE_SRC=1
|
|||||||
DIST_ENABLE=1
|
DIST_ENABLE=1
|
||||||
DIST_FOLDER="./dist"
|
DIST_FOLDER="./dist"
|
||||||
DIST_NAME="spice2x-$(date +%y)-$(date +%m)-$(date +%d).zip"
|
DIST_NAME="spice2x-$(date +%y)-$(date +%m)-$(date +%d).zip"
|
||||||
|
DIST_NAME_EXTRAS="spice2x-$(date +%y)-$(date +%m)-$(date +%d)-full.zip"
|
||||||
DIST_COMMENT=${DIST_NAME}$'\n'"$GIT_BRANCH - $GIT_HEAD"$'\nThank you for playing.'
|
DIST_COMMENT=${DIST_NAME}$'\n'"$GIT_BRANCH - $GIT_HEAD"$'\nThank you for playing.'
|
||||||
DIST_NAME_EXTRAS="spice2x-$(date +%y)-$(date +%m)-$(date +%d)-extras.zip"
|
|
||||||
TARGETS_32="spicetools_stubs_kbt spicetools_stubs_kld spicetools_cfg spicetools_cfg_linux spicetools_spice spicetools_spice_laa spicetools_spice_linux spicetools_stubs_cpusbxpkm"
|
TARGETS_32="spicetools_stubs_kbt spicetools_stubs_kld spicetools_cfg spicetools_cfg_linux spicetools_spice spicetools_spice_laa spicetools_spice_linux spicetools_stubs_cpusbxpkm"
|
||||||
TARGETS_64="spicetools_stubs_kbt64 spicetools_stubs_kld64 spicetools_stubs_nvEncodeAPI64 spicetools_stubs_nvcuvid spicetools_stubs_nvcuda spicetools_spice64 spicetools_spice64_linux"
|
TARGETS_64="spicetools_stubs_kbt64 spicetools_stubs_kld64 spicetools_stubs_nvEncodeAPI64 spicetools_stubs_nvcuvid spicetools_stubs_nvcuda spicetools_spice64 spicetools_spice64_linux"
|
||||||
|
|
||||||
@@ -231,14 +231,11 @@ fi
|
|||||||
# pack source files to output directory
|
# pack source files to output directory
|
||||||
rm -rf ${OUTDIR}/src
|
rm -rf ${OUTDIR}/src
|
||||||
mkdir -p ${OUTDIR}/src
|
mkdir -p ${OUTDIR}/src
|
||||||
rm -rf ${OUTDIR_EXTRAS}/src
|
|
||||||
mkdir -p ${OUTDIR_EXTRAS}/src
|
|
||||||
if ((INCLUDE_SRC > 0))
|
if ((INCLUDE_SRC > 0))
|
||||||
then
|
then
|
||||||
echo "Generating source file archive..."
|
echo "Generating source file archive..."
|
||||||
git archive --format tar.gz --prefix=spice2x/ HEAD ./ > ${OUTDIR}/src/spice2x-${GIT_BRANCH}.tar.gz 2>/dev/null || \
|
git archive --format tar.gz --prefix=spice2x/ HEAD ./ > ${OUTDIR}/src/spice2x-${GIT_BRANCH}.tar.gz 2>/dev/null || \
|
||||||
echo "WARNING: Couldn't get git to create the archive. Is this a git repository?"
|
echo "WARNING: Couldn't get git to create the archive. Is this a git repository?"
|
||||||
cp -r ${OUTDIR}/src/* ${OUTDIR_EXTRAS}/src
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# copy resources
|
# copy resources
|
||||||
@@ -254,11 +251,9 @@ then
|
|||||||
mkdir -p ${DIST_FOLDER}
|
mkdir -p ${DIST_FOLDER}
|
||||||
rm -rf ${DIST_FOLDER}/${DIST_NAME}
|
rm -rf ${DIST_FOLDER}/${DIST_NAME}
|
||||||
pushd ${OUTDIR}/.. > /dev/null
|
pushd ${OUTDIR}/.. > /dev/null
|
||||||
zip -qrXT9 $OLDPWD/${DIST_FOLDER}/${DIST_NAME} spice2x -z <<< "$DIST_COMMENT"
|
zip -qrXT9 $OLDPWD/${DIST_FOLDER}/${DIST_NAME} spice2x -x "spice2x/extras/*" -z <<< "$DIST_COMMENT"
|
||||||
popd > /dev/null
|
|
||||||
echo "Building extras..."
|
echo "Building extras..."
|
||||||
pushd ${OUTDIR_EXTRAS}/.. > /dev/null
|
zip -qrXT9 $OLDPWD/${DIST_FOLDER}/${DIST_NAME_EXTRAS} spice2x -z <<< "$DIST_COMMENT"
|
||||||
zip -qrXT9 $OLDPWD/${DIST_FOLDER}/${DIST_NAME_EXTRAS} spice2x_extras -z <<< "$DIST_COMMENT"
|
|
||||||
popd > /dev/null
|
popd > /dev/null
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -1226,6 +1226,10 @@ int main_implementation(int argc, char *argv[]) {
|
|||||||
|
|
||||||
log_info("launcher", "{}", VERSION_STRING);
|
log_info("launcher", "{}", VERSION_STRING);
|
||||||
|
|
||||||
|
// note: distribution of modified version of this software without providing source is GPLv3 license violation.
|
||||||
|
log_info("launcher", "spice2x is free & open source; if you paid money for it, you got scammed");
|
||||||
|
log_info("launcher", "visit https://spice2x.github.io to download the latest version for free");
|
||||||
|
|
||||||
// log command line arguments
|
// log command line arguments
|
||||||
std::ostringstream arguments;
|
std::ostringstream arguments;
|
||||||
for (auto &root_option : options) {
|
for (auto &root_option : options) {
|
||||||
|
|||||||
@@ -556,9 +556,16 @@ namespace overlay::windows {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// disclaimer
|
// disclaimer
|
||||||
|
// note: distribution of modified version of this software without providing source is GPLv3 license violation.
|
||||||
ImGui::TextColored(
|
ImGui::TextColored(
|
||||||
ImVec4(1, 0.5f, 0.5f, 1.f),
|
ImVec4(1, 0.5f, 0.5f, 1.f),
|
||||||
"Do NOT stream or upload game data anywhere public! Support arcades when you can. Thanks.");
|
"spice2x is free & open source; if you paid money for it, you got scammed.");
|
||||||
|
if (cfg::CONFIGURATOR_STANDALONE) {
|
||||||
|
ImGui::SameLine();
|
||||||
|
if (ImGui::TextLink(PROJECT_URL)) {
|
||||||
|
launch_shell(PROJECT_URL);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Config::build_buttons(const std::string &name, std::vector<Button> *buttons, int min, int max) {
|
void Config::build_buttons(const std::string &name, std::vector<Button> *buttons, int min, int max) {
|
||||||
@@ -2917,7 +2924,7 @@ namespace overlay::windows {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
ImGui::TextUnformatted("");
|
ImGui::TextUnformatted("");
|
||||||
if (ImGui::Button(PROJECT_URL)) {
|
if (ImGui::TextLink(PROJECT_URL)) {
|
||||||
launch_shell(PROJECT_URL);
|
launch_shell(PROJECT_URL);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2978,6 +2985,7 @@ namespace overlay::windows {
|
|||||||
|
|
||||||
void Config::build_menu(int *game_selected) {
|
void Config::build_menu(int *game_selected) {
|
||||||
bool about_popup = false;
|
bool about_popup = false;
|
||||||
|
ImGui::PushStyleColor(ImGuiCol_PopupBg, ImVec4(0.14f, 0.14f, 0.14f, 1.0f));
|
||||||
if (ImGui::BeginMenuBar()) {
|
if (ImGui::BeginMenuBar()) {
|
||||||
|
|
||||||
// [spice2x]
|
// [spice2x]
|
||||||
@@ -3038,6 +3046,8 @@ namespace overlay::windows {
|
|||||||
ImGui::EndMenuBar();
|
ImGui::EndMenuBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ImGui::PopStyleColor(); // ImGuiCol_PopupBg
|
||||||
|
|
||||||
// workaround for popups triggered by menu, see https://github.com/ocornut/imgui/issues/331
|
// workaround for popups triggered by menu, see https://github.com/ocornut/imgui/issues/331
|
||||||
if (about_popup) {
|
if (about_popup) {
|
||||||
ImGui::OpenPopup("About##topbarpopup");
|
ImGui::OpenPopup("About##topbarpopup");
|
||||||
|
|||||||
Reference in New Issue
Block a user