1
0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-24 00:58:50 -05:00
Commit Graph

72 Commits

Author SHA1 Message Date
Adam Bird
03da69d7b7 Merge tag '8.0.4' into HEAD
MacReady Echo
2023-12-18 00:34:59 -05:00
Garrett Cox
60faf3f750
Bump version to MacReady Echo 8.0.4 () 2023-12-17 22:47:39 -06:00
Garrett Cox
86044a1c50
Remote GI Work ()
Co-authored-by: David Chavez <david@dcvz.io>
2023-12-17 13:41:33 -06:00
briaguya
818addfdda
delta bump () 2023-11-29 01:32:15 -05:00
briaguya
0ddb0711ad
Version bump to MacReady Charlie () 2023-11-15 23:22:09 -05:00
Garrett Cox
2dfbbc63e3
Version bump to MacReady Bravo () 2023-11-14 21:14:47 -05:00
Adam Bird
30ab8e9ed7
version bump to MacReady Alfa () 2023-11-06 20:55:50 -05:00
Adam Bird
7e9efeeadb
[OTR Archive] Store soh version in OTR files and verify on launch/ask to regenerate ()
* parse sohver arg and store version file in otr

* parse args for soh.otr gen only

* pass soh version from built in extractor

* update launch scripts, cmake and extract steps to pass soh version

* check otr versions and error or ask to regenerate

* add wiiu core header for osfatal

* review feedback

* remove soh dummy version for lus change instead

* only configure linux script for linux

* change lus commit

* rename soh version to port version

* fix submodules

* bump OTRExporter

* clean up error messages for switch/wiiu

* strings not char array

* typo

* init wiiu before otr detection

* Add message for mac/linux extraction

* remove unneeded exits

* change version number types to u16 to fix 32bit devices

* bump otrexporter
2023-11-05 12:34:39 -05:00
Adam Bird
4fc0d5a753
Fix CMake extract targets to not use absolute path for xml root ()
* extract using a relative path to xmls

* pass xml root for header generation
2023-10-25 02:36:15 -04:00
Adam Bird
e369ad4c86
Pass in custom assets to OTRExporter ()
* bump submodules and use custom assets dir

* bump submodules
2023-10-24 20:51:54 -07:00
Adam Bird
1829a6a154
Update buildBUILDING.md and adjust cpack for Windows () 2023-10-09 15:28:22 +00:00
AltoXorg
6923c2d3c0
Opt-in for an easy-way CMake target to create soh.otr file ()
* use a convenient cmake target for gen soh otr

* Update generate-builds.yml

* Apply for all conditions

* grandma change
2023-08-15 19:26:23 -05:00
Christopher Leggett
8bc3077529
version bump to Sulu Bravo () 2023-08-13 20:41:57 -04:00
Christopher Leggett
b94d7f135d
give em to the distro packagers + LUS submodule bump ()
* implement for install method packagers

* use std::filesystem::temp_directory_path

* absolutely impeccable

* include libultraship proof

* fix windows compilation

* rename "Installation" back to "Bundle"

---------

Co-authored-by: Alto1772 <56553686+Alto1772@users.noreply.github.com>
2023-08-13 18:45:45 -04:00
Christopher Leggett
83ebaa2fce
Version Bump to Sulu () 2023-06-18 21:04:09 -04:00
briaguya
ef6227d8be
fully remove OTRGui ()
* linux local debug working

* built in extraction working on linux

* try a thing

* one more thing to try

* try using dir

* does this get the subdirectories?

* component before pattern

* loop i guess

* maybe component was the issue?

* zapd stuff i guess

* maybe this

* this feels promising

* g != q

* appimage is working, try fixing glfw issue on windows

* don't copy zapd.exe

* hopefully this gets the things we need in the assets dir

* is that where those went?

* try another thing

* another thing to try

* grasping at straws

* cmake makes no sense sometimes

* really just trying anything here now

* this is what i was expecting to work

* ls

* try doing it without the cmake again

* i think this might do the trick

* try with a slash

* one more thing to try

* pal_oot.txt

* maybe this makes things work on mac

---------

Co-authored-by: briaguya <briaguya@alice>
2023-06-13 09:29:36 -04:00
Christopher Leggett
e88adbe672
Version Bump () 2023-05-22 21:34:18 -04:00
Amaro Martínez
b361d5ede1
Use UTF-8 for MSVC and enable visual styles for Windows ()
* Add proper manifest for Windows

* MSVC: Use UTF-8 encoding compile option
2023-05-17 22:21:26 -04:00
Christopher Leggett
d8891f1fe4
Version Bump () 2023-05-10 21:57:22 -04:00
briaguya
3f896f126f
bump version () 2023-04-27 20:21:55 -04:00
Adam Bird
000a5d28f3
Add version info and other details to windows exe properties ()
* add version info and other details to windows exe properties

* configure properties file directly to src dir

* move version name in properties and change to Title Case
2023-04-25 10:36:35 -04:00
louist103
aea46e7cb2
Implement built in Extractor for Windows ()
* wip

* const

* split zapd into two targets

* Workingish.

* fix working dir and copy xmls on build ()

* dont change current working dir with dialog prompts

* copy asset xmls to target dir

* make zpadlib public

* Messagebox.

* Check for WIN32

* threading

* Cleanups to the exporter and main.

* Multi extraction.

* Fix byteswap header includes.

* Fix another byteswap include.

* fix again.

* stddef size_t

* Add other targets for ZAPDLib

* Non windows.

* IDYES IDNO

* Linux fixes

* hopefully remove switch and wiiu from building extractor

* Please?

* validate roms and add another valid rom

* ifdef out extract.h for switch and wiiu

* Maybe update lux

* Remove ZAPDlib from switch and WiiU

* more rules

* Update soh/soh/Extractor/Extract.cpp

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* Update ZAPDTR/ZAPD/ExecutableMain.cpp

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* Update ZAPDTR/ZAPD/CMakeLists.txt

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* Update ZAPDTR/ZAPD/GameConfig.cpp

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* Update ZAPDTR/ZAPD/Globals.cpp

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* Update ZAPDTR/ZAPD/Main.cpp

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* Update soh/CMakeLists.txt

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* Update soh/soh/Extractor/Extract.cpp

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* Update soh/soh/Extractor/Extract.cpp

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* Update soh/soh/Extractor/Extract.cpp

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* the last fix

* Add context to a comment

---------

Co-authored-by: Adam Bird <archez39@me.com>
Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
2023-04-25 00:01:17 -04:00
Adam Bird
e72eeb95aa
chore: copy otrs in windows into target dir ()
* copy otrs in windows into target dir

* improve status messaging for otr copy script
2023-04-14 09:56:38 -04:00
Adam Bird
1861335cf0
chore: move asset header generation to new ExtractAssetsHeaders target ()
* add dedicated build target for extracting asset headers conditionally

* dont gen otr when generating headers

* simplify python array
2023-04-14 09:54:56 -04:00
Adam Bird
660c3ec3b0
fix soh otr asset building not detecting textures () 2023-04-13 18:37:10 -04:00
briaguya
c4ce2f10cd
build/package/ship soh.otr ()
* update

* Update generate-builds.yml

* Update generate-builds.yml

* sohotr in CI?

* paths

* gitignore soh.otr

* Fix

* no COMMAND maybe?

* try generating otr as it's own step

* deps

* f

* g

* h

* a

* cc

* ccc

* m

* blarg

* try uploading

* try

* s

* copy things

* wii u?

* wiiu

* don't fail

* windows without cpack?

* wut

* whoops

* see all the things plz

* b

* v

* zip working maybe

* ok but this tho

* pdb and switch

* mac lus

* soh.otr in appimage

* down first

* mac

* bundle soh otr into mac app and read it from the bundle

* appimage fix

* try just downloading for mac?

* i like to mv it mv it

* mv to the right place

* no more otrgui

* bring back otrgui and assets

* echo blarg

* echo

* zapd.exe

* clean and remove

* a

* space

---------

Co-authored-by: louis <louist103@gmail.com>
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Adam Bird <archez39@me.com>
2023-04-12 21:14:33 -04:00
briaguya
b6e9e9cd0f
fix: lowercase package names for vcpkg ()
vcpkg was throwing an error `error: invalid character in package name (must be lowercase, digits, '-')`
this updates our calls to `vcpkg_install_packages` to use lowercase package names instead of uppercase
2023-04-11 08:13:21 -04:00
briaguya
0f40472c1a
khan -> dev 2023-04-02 21:37:00 -04:00
briaguya
5f708251a6
bump version () 2023-04-02 15:41:01 -04:00
briaguya
b2698fa126 Merge branch 'develop-khan' into khan-dev 2023-03-14 09:45:00 -04:00
briaguya
72b12890fd
bump version () 2023-03-14 09:16:54 -04:00
Pierre Wendling
dbcc6b4818
[CMake] Do not force CMAKE_OSX_DEPLOYMENT_TARGET ()
This leaves the default of 10.15, but allows a user to change it in the
cache. When using Homebrew libraries on newer macOS version, the linker
emits warnings:

```
ld: warning: dylib (/opt/homebrew/lib/libSDL2.dylib) was built
for newer macOS version (13.0) than being linked (11.0)
```
2023-03-05 08:38:22 +01:00
briaguya
e07de4b3b5
bump version () 2023-03-01 00:56:31 -05:00
David Chavez
27d7cb0bc1
[CMake] Clean soh/CMakeLists () 2023-02-28 19:19:34 +01:00
briaguya
242a35c3a0
bump version () 2023-02-07 00:04:19 -05:00
David Chavez
32ad0ab4b8 Bump version 2023-01-18 19:21:38 +01:00
briaguya
7768869251
bump version 2022-12-24 00:58:15 -05:00
briaguya
6eaf51c2bd
version bump () 2022-12-21 14:11:19 -05:00
KiritoDev
166a6691fc
Fixed nintendo switch debug flags () 2022-12-17 19:08:32 -05:00
briaguya
a05bc1e29f
bump version ()
Co-authored-by: briaguya <briaguya@alice>
2022-12-13 23:48:54 -05:00
briaguya
639e51bb8e
bump version ()
Co-authored-by: briaguya <briaguya@alice>
2022-12-12 23:59:05 -05:00
briaguya
4f109178ff Merge branch 'develop-flynn' into flynn-to-dev 2022-12-06 21:29:27 -05:00
briaguya
00cbd347b2
bump version ()
Co-authored-by: briaguya <briaguya@alice>
2022-12-06 20:21:38 -05:00
Christopher Leggett
806b9dc84b
Re-implements Ninja and CCache for Windows Builds ()
* Keeps default compiler flags.

* Updates github actions to use ninja and ccache for windows builds.

* Fixes ghactions to use MSVC.

* Removes commented out CMake code.
2022-11-29 22:33:43 -05:00
David Chavez
c10e4a98ca Bump version to Flynn: Bravo 2022-11-26 21:07:47 +01:00
briaguya
aa16a5388e
chore: bump version 2022-11-21 21:55:14 -05:00
briaguya
3914781ebf
Import libultraship as a submodule ()
Co-authored-by: briaguya <briaguya>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: David Chavez <davi@dcvz.io>
2022-11-14 11:22:34 +01:00
David Chavez
20cbebeed7
Allow BUILD_CROWD_CONTROL to overriden by command line 2022-11-10 16:26:33 +01:00
David Chavez
e6e7a7b549
Refactor CrowdControl Setup () 2022-11-06 11:00:34 +01:00
briaguya
af5a780e63
Merge pull request from HarbourMasters/develop-zhora
zhora -> dev
2022-10-22 16:50:23 -04:00