search

ps2dev / ps2sdk-ports

Ports of useful libraries to PS2SDK
Other
107 stars 43 forks source link

Some fixes #20

Closed AKuHAK closed 5 years ago

AKuHAK commented 5 years ago

Fixed aalib Fixed romfs clean target

sp193 commented 5 years ago

Sorry, but could you please resolve the conflicts?

AKuHAK commented 5 years ago

Oh conflicts? My github shows that everything is ok

ghost commented 5 years ago

@AKuHAK I believe the conflict came from when my PR was merged. It's just doing the same thing to libconfig as was done with free-type. From cloning your fork's original branch and trying to merge. The conflicts are in the root Makefile specifically lines 1, 18 and 20.