From 4b77d1b613cb676880eb2c5d5a1922190a542f3c Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Mon, 24 Jun 2024 09:26:03 -0500 Subject: [PATCH] Add linux-x64 compile target --- ci/linux-x64/Dockerfile | 3 +++ ci/linux-x64/docker-compose.yml | 18 ++++++++++++++++ src/dawnvita/CMakeLists.txt | 6 +++++- src/dawnvita/error/CMakeLists.txt | 10 +++++++++ src/dawnvita/error/error.cpp | 34 ++++++++++++++++++++++++++++++ src/dawnvita/host/CMakeLists.txt | 10 +++++++++ src/dawnvita/host/DawnVitaHost.cpp | 19 ++++------------- src/dawnvita/main.hpp | 2 +- 8 files changed, 85 insertions(+), 17 deletions(-) create mode 100644 ci/linux-x64/Dockerfile create mode 100644 ci/linux-x64/docker-compose.yml create mode 100644 src/dawnvita/error/CMakeLists.txt create mode 100644 src/dawnvita/error/error.cpp create mode 100644 src/dawnvita/host/CMakeLists.txt diff --git a/ci/linux-x64/Dockerfile b/ci/linux-x64/Dockerfile new file mode 100644 index 00000000..e39aaaaa --- /dev/null +++ b/ci/linux-x64/Dockerfile @@ -0,0 +1,3 @@ +FROM debian:latest +RUN apt update && apt upgrade -y && apt install -y git cmake build-essential libx11-dev libgtk-3-dev python3 python3-pip +RUN ln -s /usr/bin/python3 /usr/bin/python \ No newline at end of file diff --git a/ci/linux-x64/docker-compose.yml b/ci/linux-x64/docker-compose.yml new file mode 100644 index 00000000..0580fe54 --- /dev/null +++ b/ci/linux-x64/docker-compose.yml @@ -0,0 +1,18 @@ +services: + dawn-linux64: + build: . + volumes: + - ./../../:/Dawn + working_dir: /Dawn + command: + - /bin/sh + - -c + - | + ln -s /usr/bin/python3 /usr/bin/python + if [ ! -d ./lib/glfw ]; then + git submodule update --init + fi + mkdir -p ./build/linux-x64 + cd ./build/linux-x64 + cmake ../.. -DDAWN_BUILD_SYSTEM=linux -DGLFW_BUILD_X11=ON -DGLFW_BUILD_WAYLAND=OFF + make \ No newline at end of file diff --git a/src/dawnvita/CMakeLists.txt b/src/dawnvita/CMakeLists.txt index d758a006..c269d79c 100644 --- a/src/dawnvita/CMakeLists.txt +++ b/src/dawnvita/CMakeLists.txt @@ -40,4 +40,8 @@ target_include_directories(${DAWN_TARGET_NAME} target_sources(${DAWN_TARGET_NAME} PRIVATE main.cpp -) \ No newline at end of file +) + +# Subdirs +add_subdirectory(error) +add_subdirectory(host) \ No newline at end of file diff --git a/src/dawnvita/error/CMakeLists.txt b/src/dawnvita/error/CMakeLists.txt new file mode 100644 index 00000000..770176ba --- /dev/null +++ b/src/dawnvita/error/CMakeLists.txt @@ -0,0 +1,10 @@ +# Copyright (c) 2024 Dominic Masters +# +# This software is released under the MIT License. +# https://opensource.org/licenses/MIT + +# Sources +target_sources(${DAWN_TARGET_NAME} + PRIVATE + error.cpp +) \ No newline at end of file diff --git a/src/dawnvita/error/error.cpp b/src/dawnvita/error/error.cpp new file mode 100644 index 00000000..e929ed8c --- /dev/null +++ b/src/dawnvita/error/error.cpp @@ -0,0 +1,34 @@ +// Copyright (c) 2024 Dominic Masters +// +// This software is released under the MIT License. +// https://opensource.org/licenses/MIT + +#include "error/error.hpp" +#include +#include "dawnopengl.hpp" + +void errorMessageBox(const std::u8string &message) { + SceMsgDialogUserMessageParam msg_param; + memset(&msg_param, 0, sizeof(msg_param)); + msg_param.buttonType = SCE_MSG_DIALOG_BUTTON_TYPE_OK; + msg_param.msg = (SceChar8 *)message.c_str(); + + SceMsgDialogParam param; + sceMsgDialogParamInit(¶m); + _sceCommonDialogSetMagicNumber(¶m.commonParam); + param.mode = SCE_MSG_DIALOG_MODE_USER_MSG; + param.userMsgParam = &msg_param; + + sceMsgDialogInit(¶m); + + while(sceMsgDialogGetStatus() != SCE_COMMON_DIALOG_STATUS_FINISHED) { + glClear(GL_COLOR_BUFFER_BIT); + vglSwapBuffers(GL_TRUE); + } + + sceMsgDialogTerm(); +} + +void errorLog(const std::string &message) { + std::cerr << message << std::endl; +} \ No newline at end of file diff --git a/src/dawnvita/host/CMakeLists.txt b/src/dawnvita/host/CMakeLists.txt new file mode 100644 index 00000000..0a334714 --- /dev/null +++ b/src/dawnvita/host/CMakeLists.txt @@ -0,0 +1,10 @@ +# Copyright (c) 2024 Dominic Masters +# +# This software is released under the MIT License. +# https://opensource.org/licenses/MIT + +# Sources +target_sources(${DAWN_TARGET_NAME} + PRIVATE + DawnVitaHost.cpp +) \ No newline at end of file diff --git a/src/dawnvita/host/DawnVitaHost.cpp b/src/dawnvita/host/DawnVitaHost.cpp index a29e2716..870fbc76 100644 --- a/src/dawnvita/host/DawnVitaHost.cpp +++ b/src/dawnvita/host/DawnVitaHost.cpp @@ -16,21 +16,10 @@ DawnVitaInitResult DawnVitaHost::init() { } void DawnVitaHost::start() { - - std::stringstream output; - std::vector hello = { "Hello" }; - hello.push_back(","); - hello.push_back(" C++ "); - hello.push_back("world!"); - for (auto &s : hello) { - // std::cout does't work ATM :( - output << s; - } - output << std::endl; - psvDebugScreenInit(); - printf("%s\n", output.str().c_str()); - sceKernelDelayThread(3*1000000); // Wait for 3 seconds - sceKernelExitProcess(0); + while(true) { + // Continue endless. + + } } DawnVitaHost::~DawnVitaHost() { diff --git a/src/dawnvita/main.hpp b/src/dawnvita/main.hpp index 483afafc..c7c0e462 100644 --- a/src/dawnvita/main.hpp +++ b/src/dawnvita/main.hpp @@ -13,4 +13,4 @@ * @param argv The arguments passed to the program. * @return The exit code of the program. */ -int32_t main(const int32_t argc, const char_t* args[]); \ No newline at end of file +int32_t main(void); \ No newline at end of file