search

OutpostUniverse / OP2Archive

Console Application for examining, creating, and extracting files from Outpost 2 .vol and .clm archives.
https://wiki.outpost2.net/doku.php?id=outpost_2:helper_programs:op2archive
MIT License
1 stars 0 forks source link

Update makefile #21

Closed DanRStevens closed 6 years ago

DanRStevens commented 6 years ago

This updates the makefile for the moved source folder.

Includes changes so the submodule is built as a separate library, using the library's makefile, rather than building all source as if it was one project.

Includes a few updates to variables so use is more consistent with built-in implicit Make rules.

DanRStevens commented 6 years ago

This slipped my mind, but the submodule has not been updated in this branch, and should be before merging. That is important, since the makefile for the OP2Utility library was updated to have the library output and path changed to match the CMake build system. Will update once changes are merged upstream.

DanRStevens commented 6 years ago

For reference: GNU Make Implicit Variables

This provides the rationale for changes to CFLAGS, CXXFLAGS, CPPFLAGS, LDFLAGS, and LDLIBS.

DanRStevens commented 6 years ago

Ok, seems when two branches update submodules at the same time, it leads to a merge conflict for the submodule. At least that's what GitHub displays. When using the command line Git client, it is able to merge the branches together without manual updates.

As a note, this branch has makefile changes which depend on recent makefile changes in OP2Utility.