Learning to use git and github

[FluffyFreak]

What are the errors?

[nick]

Error 40 error LNK1120: 9 unresolved externals C:\Users\Nick\Documents\Nick\Programming\C and C++\Pioneer\pioneer\pioneer-debug.exe pioneer
Error 38 error LNK2001: unresolved external symbol __imp__curl_easy_cleanup C:\Users\Nick\Documents\Nick\Programming\C and C++\Pioneer\pioneer\win32\vc2013Express\ServerAgent.obj pioneer
Error 39 error LNK2001: unresolved external symbol __imp__curl_easy_getinfo C:\Users\Nick\Documents\Nick\Programming\C and C++\Pioneer\pioneer\win32\vc2013Express\ServerAgent.obj pioneer
Error 35 error LNK2001: unresolved external symbol __imp__curl_easy_init C:\Users\Nick\Documents\Nick\Programming\C and C++\Pioneer\pioneer\win32\vc2013Express\ServerAgent.obj pioneer
Error 37 error LNK2001: unresolved external symbol __imp__curl_easy_perform C:\Users\Nick\Documents\Nick\Programming\C and C++\Pioneer\pioneer\win32\vc2013Express\ServerAgent.obj pioneer
Error 36 error LNK2001: unresolved external symbol __imp__curl_easy_setopt C:\Users\Nick\Documents\Nick\Programming\C and C++\Pioneer\pioneer\win32\vc2013Express\ServerAgent.obj pioneer
Error 34 error LNK2001: unresolved external symbol __imp__curl_easy_strerror C:\Users\Nick\Documents\Nick\Programming\C and C++\Pioneer\pioneer\win32\vc2013Express\ServerAgent.obj pioneer
Error 31 error LNK2001: unresolved external symbol __imp__curl_global_init C:\Users\Nick\Documents\Nick\Programming\C and C++\Pioneer\pioneer\win32\vc2013Express\ServerAgent.obj pioneer
Error 32 error LNK2001: unresolved external symbol __imp__curl_slist_append C:\Users\Nick\Documents\Nick\Programming\C and C++\Pioneer\pioneer\win32\vc2013Express\ServerAgent.obj pioneer
Error 33 error LNK2001: unresolved external symbol __imp__curl_slist_free_all C:\Users\Nick\Documents\Nick\Programming\C and C++\Pioneer\pioneer\win32\vc2013Express\ServerAgent.obj pioneer

[FluffyFreak]

I can think of 3 possible causes:

(1) Pioneer root folder should be renamed to "pioneer-master".

(2) Compiling guide says 'After cloning the repo, move it to a folder called "pioneer-thirdparty" alongside your "pioneer" folder.'
So the "pioneer-thirdparty" folder created by the clone command might need to be put in another folder called "pioneer-thirdparty"?

(3) The two new files I've added need to be referenced in some other part of the source code.

(1) the name of the pioneer folder doesn't matter, I have 3 cloned side-by-side so I can swap between things and compare between them (it's a weird setup I have). Called "pioneer", "pioneer-ssh" & "pioneer-3rd"... imaginative I know.

(2) it just needs to be called "pioneer-thirdparty", because the vs2013 build references it with a relative path by that name.

(3) Have you added them to the project? What errors do you get? Have you pushed your current work to your repository? I could take a look at it tomorrow.

[nick]

(3) Yes. And in solution explorer I've dragged them (JsonUtils.h & JsonUtils.cpp) to the json folder (I had to do this previously to get pioneer to build).

[nick]

I'll push what I have to my github repo later this evening.

git push origin JSONSerialise

[nick]

I'd be grateful if you could have a look tomorrow :)

I've committed all the JSON serialisation code, and pushed JSONSerialise to origin
https://github.com/nick-the-ninja/pione ... NSerialise
It should be working fine (provided you don't get the linker errors).
Pioneer is using the JSON system. I haven't removed the old serialisation code yet.
Thanks for your help this evening :)

[nick]

I'm going to remove the old serialisation code this evening.

Then I'll merge-in any changes from upstream:
git fetch upstream
git merge

and push my branch to github repo again:
git push origin JSONSerialise

Then that's pretty much all I can do, unless I can solve the linker errors.
At this point, should I create another PR?
[Edit] I'm on IRC
[Edit] Oops, just realised I left out the JSON serialisation code for class Player - will put it in now.

[nick]

JSON Serialisation code is now in place. Old serialisation code has been removed (old ModelSkin serialisation function is used by other code, so I've left that in place).

I've merged upstream into my branch and pushed to origin:
git pull upstream master
git push origin JSONSerialise
think I'm getting the hang of git :)

Still getting the linker error, so I've not been able to test.
I'll keep JSONSerialise up to date with any changes in upstream.

FluffyFreak: When you've got time, please could you try to build JSONSerialise, and let me know if you get the linker errors too? :)
[Edit] Also, I'd be grateful if you could check my git commands in this post (I'm suspicious about not needing to commit after the pull - it did say 2 files were changed).
Cheers,
Nick

[impaktor]

I'm suspicious about not needing to commit after the pull

When you pull from upstream you get the commits from there, thus you need not commit your pull. You only need to commit your own changes on your own local branch. Have a look at git log before and after a git pull (or git merge)

Then I'll merge-in any changes from upstream:
git fetch upstream
git merge

You probably mean

Code: Select all

git fetch upstream
git merge upstream/master

(or at least that is how I do it).

Also note that git fetch + git merge is the same as just doing a git pull.

Good luck!

[FluffyFreak]

@nick, that all compiles and links just fine for me but only in release.

When you do your next "git pull upstream/master" to merge in the latest I should have fixed up the other configurations. It's nothing you've done it's something I forgot to do!