Skip to content

Do not show the console on Windows #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 3, 2024
Merged

Do not show the console on Windows #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a685180
Do not show the console on Windows
mmatyas May 2, 2024
7c2bf7b
Updated the GitHub Actions deprecations
mmatyas May 3, 2024
97080f8
Updated the SDL libraries on AppVeyor
mmatyas May 3, 2024
f02fd81
Fixed the SDL main entry point when using MSVC
mmatyas May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,25 @@ install:
- mkdir %LIBDIR%
- cd %TEMP%
# Download SDL2
- appveyor DownloadFile https://www.libsdl.org/release/SDL2-devel-2.0.5-VC.zip
- appveyor DownloadFile https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.0.1-VC.zip
- appveyor DownloadFile https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.0.1-VC.zip
- appveyor DownloadFile https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-devel-2.0.14-VC.zip
- appveyor DownloadFile https://www.libsdl.org/release/SDL2-devel-2.30.3-VC.zip
- appveyor DownloadFile https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-2.8.2-VC.zip
- appveyor DownloadFile https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-2.8.0-VC.zip
- appveyor DownloadFile https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-devel-2.22.0-VC.zip
# Extract files
- 7z x SDL2-devel-2.0.5-VC.zip > nul
- 7z x SDL2_image-devel-2.0.1-VC.zip > nul
- 7z x SDL2_mixer-devel-2.0.1-VC.zip > nul
- 7z x SDL2_ttf-devel-2.0.14-VC.zip > nul
- 7z x SDL2-devel-2.30.3-VC.zip > nul
- 7z x SDL2_image-devel-2.8.2-VC.zip > nul
- 7z x SDL2_mixer-devel-2.8.0-VC.zip > nul
- 7z x SDL2_ttf-devel-2.22.0-VC.zip > nul
# Set up includes
- copy SDL2-2.0.5\include\* %INCLUDEDIR% > nul
- copy SDL2_image-2.0.1\include\* %INCLUDEDIR% > nul
- copy SDL2_mixer-2.0.1\include\* %INCLUDEDIR% > nul
- copy SDL2_ttf-2.0.14\include\* %INCLUDEDIR% > nul
- copy SDL2-2.30.3\include\* %INCLUDEDIR% > nul
- copy SDL2_image-2.8.2\include\* %INCLUDEDIR% > nul
- copy SDL2_mixer-2.8.0\include\* %INCLUDEDIR% > nul
- copy SDL2_ttf-2.22.0\include\* %INCLUDEDIR% > nul
# Set up libs
- copy SDL2-2.0.5\lib\x86\* %LIBDIR% > nul
- copy SDL2_image-2.0.1\lib\x86\* %LIBDIR% > nul
- copy SDL2_mixer-2.0.1\lib\x86\* %LIBDIR% > nul
- copy SDL2_ttf-2.0.14\lib\x86\* %LIBDIR% > nul
- copy SDL2-2.30.3\lib\x86\* %LIBDIR% > nul
- copy SDL2_image-2.8.2\lib\x86\* %LIBDIR% > nul
- copy SDL2_mixer-2.8.0\lib\x86\* %LIBDIR% > nul
- copy SDL2_ttf-2.22.0\lib\x86\* %LIBDIR% > nul

before_build:
- cd %APPVEYOR_BUILD_FOLDER%
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
libsdl2-mixer-dev
libsdl2-ttf-dev

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: 'recursive'

Expand All @@ -39,7 +39,7 @@ jobs:
run: ./etc/appimage/travis.sh
if: matrix.build == 'Release'
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux
path: /home/runner/out
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_psvita.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
add-apt-repository -y ppa:git-core/ppa
apt-get install -y git

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: 'recursive'

Expand All @@ -25,7 +25,7 @@ jobs:
run: make VERBOSE=1

- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: vita
path: src/openblok.vpk
4 changes: 2 additions & 2 deletions .github/workflows/build_windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install prebuilt dependencies
run: curl -L 'https://github.com/mmatyas/openblok/releases/download/v0.6.0/windep.tar.xz' | sudo tar xJf - -C /opt/

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: 'recursive'

Expand All @@ -38,7 +38,7 @@ jobs:
(cd install && rm libFLAC* libmod* libopus* libtiff* libwebp*)
mv install openblok && zip -r openblok.zip openblok
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows
path: openblok.zip
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OpenBlok executable settings
add_executable(openblok main.cpp)
add_executable(openblok WIN32 main.cpp)

configure_file(version.h.in generated/version.h @ONLY)
target_include_directories(openblok PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/generated")
Expand Down
4 changes: 3 additions & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#include "system/Paths.h"
#include "system/util/MakeUnique.h"

#include "SDL_main.h"

#include <algorithm>
#include <chrono>
#include <memory>
Expand All @@ -35,7 +37,7 @@
const std::string LOG_MAIN = "main";
const std::string LOG_HELP = "help";

int main(int argc, const char** argv)
int main(int argc, char* argv[])
{
Log::info(LOG_MAIN) << "OpenBlok, created by Mátyás Mustoha, " << game_version << "\n";

Expand Down