summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)Author
2023-08-09Support for compiling on MacOS 10.14 (#300)Robin Allen
2023-07-20Updated to use clang-format-14 (#297)Nicholas Estelami
2022-12-06Cleanups (#273)louist103
2021-12-14Mac fixes (#217)EllipticEllipsis
* Fix makefiles * Fixed-width type printing macros to suppress warnings * Update readme
2021-12-13Remove `-Werror` enabled by default and remove `-march`/`-mtune` (#210)Anghelo Carvajal
* Remove `-Werror` enabled by default * Remove -march and -mtune flags
2021-10-16`ExternalFile`: Expose other XML's declarations during extraction (#151)Anghelo Carvajal
* proof of concept * fix header include paths * GetDeclarationAlignment and others * this should fix this * minor * DeclareVar in ExtractFromXML * fix vtx intersections * Fix segmented vtxs * --version * zcollision changes * Use GetSegmentedPtrName a lot more * memory related stuff * minor style fixes and use the actual symbol for zlinkanimation instead of the hex address * Simplify lots of GetSourceOutputCode * ZSkeleton cleanup and other changes * Elevate unknown types in skeleton to errors * ZAnimation cleanup * Add ExternalFile to config * delete some code * Remove unused code * fix conflicts * format * remove redundant constructors * minor fixes * fix vtx warnings * extract every vtx as standalone files * format * uups * Bugfix: don't create extra blank files * Fix some Vtx warnings and remove "defaulting to normal" in skeleton error * Refactor ZLimb * Make each limb to look up in every file for dlists * Use GetSegmentedArrayIndexedName in VTX references in dlists * simplify simple condition * search by type * run format * Revert "search by type" This reverts commit a049bdfc94c4ab04613b354f466dee836a20508a. * Add range checks * uups * Always set rangeEnd * special case zsymbol * Revert "Revert "search by type"" This reverts commit 3f6e77c780bd30dc7000614304021a0940168316. * symbol fix and IsOffsetInFileRange * Bugfix and minor checks * run format * Don't extract data from external files * Fix extraction of overly big tluts * Minor changes * More minor fixes * Fix clang warnings * Remove unused parameter * Fix merge issues * Fix ZLimbTable::DeclareVar * Fix limbs not naming properly their DLists * Remove segment number check * Fix merge problems * Run formatter * Maybe fix? * path * empty commit * Fix a typo * Fix merge issues * Fix null ptr dereferencing * Fix merge issues and some clang warnings * Format * Fix not-matching * Format * Fix merge issues * Fix exporter * Last fixes I hope * Fix merge issues * format * fix * fix * I'm dumb * format * static fix * Whoops * fix asan * Fix? * fix * reduce artificial changes * reduce artificial changes 2 * reorder more stuff * format * fix borken thing * Remove redundant stuff in zfile * fix * Format * Fix conflict issues * format * cleanup header includes * format * Add error checks in for ExternalXMLFolder * format
2021-10-04Add CXXFLAGS back to linking (#197)EllipticEllipsis
2021-09-28Add automatic clang and ld.lld support (#195)EllipticEllipsis
* Add automatic clang and ld.lld support to makefile * Add default value back
2021-09-23Add `BaseAddress` check (#191)Anghelo Carvajal
* Add BaseAddress check * Fix makefile stuff * remove "aborting" * i'm dumb
2021-09-20Improve makefiles (#187)EllipticEllipsis
* Rewrite makefiles, eliminate all the extra clang warnings * Include stdexcept in BinaryReader * Update gitignore * Clean up flags, add LLD option * Update readme to mention LLD * Update ExporterTest makefile in line with the others * OUTPUT_OPTION and remove redundant Main rule * Order arguments consistently, add note on submake variables
2021-09-13ZRoom cleaning 3 (#140)Anghelo Carvajal
* Remove redundant scene member * altheaders clean * it is broken and I don't know why * fix VTXs * Fix the stuff I broke in SetRoomList * Add RoomAltHeader and SceneAltHeader * fix syotes again and set the size of each ZRoomCommand * Add SCENE_CMD_UNK_09 todo * Nuke HintSystem * run format * Remove `canHaveInner` from ZRoom since the HintSystem doesn't exists anymore * Remove sourceOutput member from ZResource * Update docs * run format * Add non 64-bits aligned textures warning * remove unused json library * Update SCENE_CMD_UNK_09 * Fix merge issues * run format * Clean up actorlist output * Fix merge conflicts * format * Fix actorlist extraction * Unify AltHeader * fix merge conflicts * Run formatter * minor style changes * fix using wrong symbols for extracted vtxs from overlays * format * fix makefile stuff * fix merge issue
2021-09-12Fix compilation with -Wextra (#164)Random
* add -Wextra -Werror * remove void arg in GfxdCallback_FormatSingleEntry * mark CRC32 functions as maybe_unused * remove useless comment * fix clang warnings * replace (void) with [[maybe_unused]] * run make format
2021-08-08Moved utility code into its own library (#162)Nicholas Estelami
* Initial exporter implementation * Updated to use static library. * minor cleanup * Cleaned things up a bit * Fixed merge issues * Minor commenting * Added Begin and End functions, and removed HL stuff (to be turned into an exporter at a later date) * Cleaned some stuff up * Additional cleanup * Removed some commented out code * Fixed compilation issues * Cleanup * Fixed merge issues * Got rid of unused windows.h includes * Cleanup * Fixed warning * Removed additional redundancies * Cleanup * Fixed merge issues * Fixed some compiler issues, added makefile for exportertest. * Removed redundancies and clang formatted * Made sure exportertest compiles with C++17 * Moved certain files into new "Utils" folder. * GetExporterMap uses a reference now * Minor fixes and updates. * Moved utility code into its own library * Fixed merge issues * Fixed compilation issue * Added missing classes * Updated makefile * Minor update * Forgot to make an enum an 'enum class' * Minor fix * Few more adjustments * Bug fix * Another bug fix * Bug fix again * added comment * New functions added for exporters * Made certain fields public Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2021-08-05Exporter Support Added (#127)Nicholas Estelami
* Initial exporter implementation * Updated to use static library. * minor cleanup * Cleaned things up a bit * Fixed merge issues * Minor commenting * Added Begin and End functions, and removed HL stuff (to be turned into an exporter at a later date) * Cleaned some stuff up * Additional cleanup * Removed some commented out code * Fixed compilation issues * Cleanup * Fixed merge issues * Got rid of unused windows.h includes * Cleanup * Fixed warning * Removed additional redundancies * Cleanup * Fixed merge issues * Fixed some compiler issues, added makefile for exportertest. * Removed redundancies and clang formatted * Made sure exportertest compiles with C++17 * Moved certain files into new "Utils" folder. * GetExporterMap uses a reference now * Minor fixes and updates. Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2021-07-27Fix unused enum value warning (#159)Anghelo Carvajal
* Fix Limb warning * another warning fixed
2021-06-23Add some small optimizations. (#154)louist103
* done * Globals has returned to the heap.
2021-06-23Use `CXX` instead of `CC` for the C++ compiler (#145)Anghelo Carvajal
* CXX * Add CXX again * CFLAGS -> CXXFLAGS
2021-06-11Add `rgba16` format and deprecate `rgb5a1` (#142)Anghelo Carvajal
* Add rgba16 and deprecate rgb5a1 * empty commit to trigger jenkins * Flip DEPRECATION_OFF to ON
2021-06-10Improve Makefile compatability (GCC 5.4, Clang 12) (#138)Zach Banks
Tested with GCC 5.4 & Clang 12 on Ubuntu 16.04 ``` $ gcc --version gcc (Ubuntu 5.4.0-6ubuntu1~16.04.12) 5.4.0 20160609 Copyright (C) 2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ clang-12 --version Ubuntu clang version 12.0.0-++20210319082646+4990141a4366-1~exp1~20210319193401.61 Target: x86_64-pc-linux-gnu Thread model: posix InstalledDir: /usr/bin ``` Tested with: ``` $ make -j4 $ make CC=clang-12 -j4 ```
2021-06-02Remove debugging symbols in standard builds and add debug mode (#147)Anghelo Carvajal
* Add `DEBUG` to makefile * Document the new stuff and add `--version` flag
2021-05-07Change image library to `libpng` and improve how palettized textures are ↵Anghelo Carvajal
extracted (#133) * trying to change to libpng * It works again! * move the libpng abstraction to another file * GetBytesPerPixel * I'm dumb * fix warnings and remove dead code * Fix CRC being called multiples times and clean up code * textureDataRaw * code clean * Optimizations and removal of redundant data moves * ups * run format * use fs::path more * i'm dumb again * Add a Readme * remove texDeclarations * handle tluts better * vtx change and set segment file * small changes * Fix ZAPD ignoring textures declared in a scene in the XML * small cleanup before tluts * paletted images are broken * kinda works for automatic textures * fix automatic ci * TEXTURE_DEBUG * Remove extra `-j` * Fix extraction of ci4 * Finally palettes OK * ups * Move textures map to ZFile * Fix intersection warnings * Add `TlutOffset` attribute * Move Tlut declaration to a later step * Hopefully the last cleanup of this branch * Run format * Always calc hash * run format * Delete stb * fix merge issues * run format
2021-05-06Add a `format` rule to Makefile (#134)Anghelo Carvajal
* Add format rule to makefile * run format
2021-05-03Fix `-export-dynamic` in mac (#131)Anghelo Carvajal
2021-04-28Use OutputFormatter for every C and H file, to improve the generated output ↵Anghelo Carvajal
(#122) * Small changes in collision * Use outputformatter to write C files * Outputformatter for .h files * Use more fs::path * Use gfxd_udata_set and gfxd_udata_get instead of an instance * Fix merge issues and warnings * run format
2021-04-24Fix most -Wall warnings (#115)louist103
* started on basic type errors * Done. For now * remove libgfxd binary * Most warnings fixed * Fix conflicts and new warnings * Makefile * Sig * Clang format * destructor * Add a bunch of destructors * clear the scalars vector after freeing the elements * PR fixes (Anghelo Alf) * Fix most clang -Wall warnings
2021-04-15Rename "Prerender" to "Background", properly extract PolygonType1 multi ↵Anghelo Carvajal
format and change some structs used. (#107) * Extract BgImage Signed-off-by: angie <angheloalf95@gmail.com> * improve the output a bit Signed-off-by: angie <angheloalf95@gmail.com> * extract backgrounds for multipoly Signed-off-by: angie <angheloalf95@gmail.com> * Extract the dlists of PolygonDlist Signed-off-by: angie <angheloalf95@gmail.com> * commands in the next line Signed-off-by: angie <angheloalf95@gmail.com> * Move a lot of repeated code into a class Signed-off-by: angie <angheloalf95@gmail.com> * Use PolygonDlist instead of MeshEntry0 Signed-off-by: angie <angheloalf95@gmail.com> * Rename prerender to background Signed-off-by: angie <angheloalf95@gmail.com> * format Signed-off-by: angie <angheloalf95@gmail.com> * last cleanup Signed-off-by: angie <angheloalf95@gmail.com> * Handle jpg padding Signed-off-by: angie <angheloalf95@gmail.com> * Add a few checks and warnings for jpeg validity Signed-off-by: Angie <angheloalf95@gmail.com> * typo Signed-off-by: Angie <angheloalf95@gmail.com> * fix merge error Signed-off-by: angie <angheloalf95@gmail.com> * Fix background extraction that somehow was broken Signed-off-by: angie <angheloalf95@gmail.com> * re-add the trailling line feed Signed-off-by: angie <angheloalf95@gmail.com> * add trailing line feed again Signed-off-by: angie <angheloalf95@gmail.com> * fix an already fixed warning Signed-off-by: angie <angheloalf95@gmail.com> * fix crash when no config file is provided * run format
2021-04-13Refactoring and various features added (#108)Nicholas Estelami
* ZAPD prints out git hash * Refactor: ZResource constructor sets parent always. ZOverlay also no longer a ZResource, since it did not make much sense. * Organized ZResource a bit * A number of bug fixes, cleanup, and feature improvements. * Prepping for legacy dlist disasm * Fixed some merging issues. Fixed compilation issues with MSVC. Added in proper support for legacy display list disassembler. Refactored parts of ZFile. * Merge with upstream * Finished ZFile refactor, and other tidying. * Fixed up merge issues * Minor cleanup * Got rid of libgfxd_win.a * Fixed matching issue * Fixed up a few bugs * Fixed issue with exceptions * Fixed up merge issues with ZPrerender, along with cleaning up some code * Additional cleanup * Fixed merge issues with ZMtx and fixed a bug with ZDisplayList * Fixes based on PR feedback * run clang-format (#7) Signed-off-by: angie <angheloalf95@gmail.com> * Fixed merge issues with Roz's PR * Misc fixes * Fixed MM bug, removed redundant file. * Removed some commented out code Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com> Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
2021-04-01Unmangle backtrace (#100)Anghelo Carvajal
* its kinda functional Signed-off-by: angie <angheloalf95@gmail.com> * Looks nicer now Signed-off-by: angie <angheloalf95@gmail.com> * cleanup the makefile Signed-off-by: angie <angheloalf95@gmail.com> * Fix small issues with error handling Signed-off-by: angie <angheloalf95@gmail.com> * fix order of dependencies of main.cpp in makefile Signed-off-by: Angie <angheloalf95@gmail.com> * Add varname to the intersection warning Signed-off-by: angie <angheloalf95@gmail.com> * run clang-format Signed-off-by: angie <angheloalf95@gmail.com> * Don't print the backtrace two times Signed-off-by: angie <angheloalf95@gmail.com>
2021-03-20Add a clang-format config and reformat all source files (#63)Léo Lam
* build: Add genbuildinfo as a dependency for ZAPD object files * Add a clang-format config and reformat all source files The existing code style is mostly preserved; this just makes formatting more consistent and prevents lines from getting too long. * Fix missing includes
2021-03-19Merge pull request #96 from ethteck/new-jenkins-agentfig02
Configure Jenkinsfile to build on new "slug" Jenkins agent
2021-03-19Fix `make setup` (#95)Anghelo Carvajal
* Fix `make setup` Signed-off-by: angie <angheloalf95@gmail.com> * Use current libgfxd makefile instead Signed-off-by: Angie <angheloalf95@gmail.com> * change make clean a bit Signed-off-by: Angie <angheloalf95@gmail.com>
2021-03-18Merge branch 'master' into new-jenkins-agentEthan Roseman
2021-03-18Depend on system ccache setupEthan Roseman
2021-03-17Remove libgfxd binary (#90)louist103
* started on basic type errors * Done. For now * remove libgfxd binary * New libgfxd with MSVC support
2021-03-12Use libgfxd (gfxdis) for display lists (#84)fig02
* start * dlists work * progress * vtx works * texture wip * debugging * palletes sorta working * pal issue sort of fixed * progress * fiix * switching to master * progress * OK * fixes * whitespace * libgfxd update * prep for merge * use new seg2filespace function * vtx
2021-01-26ZAPD prints out git hash (#80)Nicholas Estelami
2021-01-05Move libraries into their own folder (#57)Léo Lam
Libraries are typically put into a separate "libraries" or "externals" directory to keep project source code and external code separate.
2021-01-05Don't link stdc++fs on MacOS (#60)Ethan Roseman
2021-01-04Makefile no longer includes ZAP/sqlite (#53)Kenix3
2020-12-30fix makefile (#34)fig02
2020-12-29Update MakefileNicholas Estelami
2020-12-29Update MakefileNicholas Estelami
2020-12-29Removed redundanciesNicholas Estelami
2020-12-29Added in support for FlexSkeletonHeader, removed sqlite, fixed crash that ↵Nicholas Estelami
occurs when no arguments are provided, cleaned up code output for rooms/scenes, WIP support for configuration file.
2020-12-27More cleanupNicholas Estelami
2020-12-27Did some housecleaningNicholas Estelami
2020-12-22Added compiler def for assimp usageNicholas Estelami
2020-12-22Added assimp library. Work on adding in FBX support. Fixed some matching issues.Nicholas Estelami
2020-11-09Commented out copy operation in makefileNicholas Estelami
2020-11-04Fixed several matching issuesNicholas Estelami