Merging TC and Eluna

[Artykalamata]

Hey, we tried to merge Eluna to a TC source with the Guide: https://github.com/ElunaLuaEngine/Eluna/blob/master/docs/MERGING.md

When we try to compile the core cmake dosent shows Eluna in the config.

Do we have to edit CMakeLists.txt ?

 

[Foereaper]

That is only merging Eluna with our preconfigured sources. Adding Eluna to an already existing source would be less simple, as you'd have to add the dependencies to your already existing source.

 

[Xaver]

the if I have another source I can not embed Eluna?

i have trinity core

 

[Mathias]

I just backuped my customs and pulled the ELuna source then added the custom scripts / mods back in and fixed a few compile errors

probably the simplest way of doing a merge

 

[Rochet2]

Hey, we tried to merge Eluna to a TC source with the Guide: https://github.com/ElunaLuaEngine/Eluna/blob/master/docs/MERGING.md

When we try to compile the core cmake dosent shows Eluna in the config.

Do we have to edit CMakeLists.txt ?

You likely did not do all the changes necessary.
Yes. a part of the edits needed are in Cmakelists, but if the merge was succesful (the pull) these should have been done automatically.
Did you get any merge errors from git pull?
You may need to delete cmake cache.
Try seeing git status and / or git diff

Did you try to actually compile anyways?

ps. Would it be possible to get the TC commit you are trying to merge with?

 

[Xaver]

looking i have buy the core from wowsource v8
and i well implement eluna funkions

i have full source from v8 this is trinity.

 

[Hyperion]

This is why it's easier to just use our already combined Eluna+TC source. It's only updated when necessary.

 

[Xaver]

i know

i have follow this instruction

https://github.com/ElunaLuaEngine/Eluna/blob/master/docs/MERGING.md

here is the console from bash
-------------------------------------------------------------------------------------


Administrator@WIN-NDKT0FRJP7R /c/core
$ git init
Initialized empty Git repository in C:/core/.git/

Administrator@WIN-NDKT0FRJP7R /c/core (master)
$ git remote add Eluna https://github.com/ElunaLuaEngine/ElunaTrinityCata.git

Administrator@WIN-NDKT0FRJP7R /c/core (master)
$ git pull Eluna master
remote: Counting objects: 298457, done.
remote: Compressing objects: 100% (63320/63320), done.
remote: Total 298457 (delta 232249), reused 298451 (delta 232245)
Receiving objects: 100% (298457/298457), 199.54 MiB | 11.94 MiB/s, done.
Resolving deltas: 100% (232249/232249), done.
From https://github.com/ElunaLuaEngine/ElunaTrinityCata
* branch master -> FETCH_HEAD
* [new branch] master -> Eluna/master
error: Untracked working tree file 'CMakeLists.txt' would be overwritten by merg
e.

Administrator@WIN-NDKT0FRJP7R /c/core (master)
$


-------------------------------------------------------------------------------------

this not working




one of the can is easily

I've never done this

and without help is nothing I need to see a time

then I can do it


can a member and admin my help for Teamviwer or skype pls ??

 

[Xaver]

here is the new errors

http://pastebin.com/i3SEmQfQ


but I am come again, I think

but go to sleep now

 

[Foereaper]

What is your native language? Hopefully we have someone able to speak it who could explain what the problem is to you.

 

[Xaver]

germany and greece

 

[Foereaper]

Chris will most likely try to help you out in German then

 

[Xaver]

thx

 

[Foereaper]

The op is using a private source that he purchased. It's from 2012. Marking this as solved.