Online Support (PRO Online)

[Ritori]

(11-24-2013 08:27 AM)Kyhel Wrote:  When you've downloaded the zip, you open the Windows folder and launch the PPSSPP.sln file, which should open if you have Visual Studio on your computer.

Then you apply these https://github.com/igorcalabria/ppsspp/c...e781a9b43e changes to the different files in Core/HLE/sceNetAdhoc.cpp and proAdhoc.cpp and proAdhoc.h and even maybe sceNetAdhoc.h (igorcalabria has moved some of the code from sceNetAdhoc.cpp into proAdhoc.cpp and proAdhoc.h, so the changes you see on the link i gave you may refer to proAdhoc.cpp and proAdhoc.h instead of sceNetAdhoc.cpp (use the ctrl+f research to find where to modify).

so i need manual merge? i clueless how to manual merge . I will merge adhoc-support-windows for now if i merge both adhoc-support and adhoc-support-windows of it give me conflict.

btw where i should put these adhocserversrc.zip file? on ppsspp/core/?