Print

Please login or register.
1 Hour 1 Day 1 Week 1 Month Forever
Login with username, password and session length

I consider it an essential part of Dwaf Fortress, and can't play without it.

119 (18.4%)

I use it for pretty screenshots, but otherwise don't use it during play.

211 (32.7%)

I only try it occasionally.

174 (27%)

I have no idea why I'm even in this thread, I don't use it.

141 (21.9%)

Total Members Voted: 642

[Rose]

Yeah, I've been fiddling with it, and it wasn't working when I posted that.

If you pulled more than... about two hours ago, try again. And you may want to discard all the stuff you have locally, just in case.

[arclance]

Yeah, I've been fiddling with it, and it wasn't working when I posted that.

If you pulled more than... about two hours ago, try again. And you may want to discard all the stuff you have locally, just in case.

I will try again but I think it was a little less than two hours ago.

[Rose]

It's likely that you still have the commits that I got rid of.

browse to the stonesense folder with the git shell, and do "git reset --hard origin/master" to get rid of them. It /should/ work.

[arclance]

It's likely that you still have the commits that I got rid of.

browse to the stonesense folder with the git shell, and do "git reset --hard origin/master" to get rid of them. It /should/ work.

I did a

Code: [Select]

git reset --hard origin/master
HEAD is now at ca8c930 Merge branch 'master' of https://github.com/Caldfir/stonesenseand a fresh pull of the dfhack and your stonesense repo and the build failed in the same place both times.

Code: [Select]

[ 85%] Building CXX object plugins/stonesense/CMakeFiles/stonesense.dir/Tile.cpp.o
In file included from /home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/Tile.cpp:1:0:
/home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/common.h:2:0: warning: ignoring #pragma warning
/home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/common.h:3:0: warning: ignoring #pragma warning
/home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/common.h:4:0: warning: ignoring #pragma warning
In file included from /home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/common.h:39:0,
                 from /home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/Tile.cpp:1:
/home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/Tile.h: In function ‘bool IDhasOpaqueFloor(int)’:
/home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/Tile.h:202:55: error: ‘FlowPassableDown’ was not declared in this scope
/home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/Tile.cpp: In member function ‘void Tile::AssembleTile()’:
/home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/Tile.cpp:307:139: warning: comparison between signed and unsigned integer expressions
/home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/Tile.cpp:345:90: warning: comparison between signed and unsigned integer expressions
/home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/Tile.cpp:419:129: warning: comparison between signed and unsigned integer expressions
/home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/Tile.cpp:464:157: warning: comparison between signed and unsigned integer expressions
/home/arclance/0_Build/dfhack/Peterix/dfhack_2012-12-26_2/plugins/stonesense/Tile.cpp:466:156: warning: comparison between signed and unsigned integer expressions
make[2]: *** [plugins/stonesense/CMakeFiles/stonesense.dir/Tile.cpp.o] Error 1
make[1]: *** [plugins/stonesense/CMakeFiles/stonesense.dir/all] Error 2
make: *** [all] Error 2


[Rose]

Did it give any error messages when it pulled?

[arclance]

No it did not.

[Rose]

wait, didn't look at the error correctly.

Where did you pull DFhack from?

Stonesense needs the latest Dfhack and Df-structures from Angavrilov's branch.

[arclance]

wait, didn't look at the error correctly.

Where did you pull DFhack from?

Stonesense needs the latest Dfhack and Df-structures from Angavrilov's branch.

I pulled it from the stable peterix branch.
I have never even heard of Angavrilov's branch.
I will try again using that branch.

[Rose]

Yeah, peterix's branch is waaaay out of date.

[arclance]

I have not started building yet but I have to wonder why angavrilov's branch pulls in peterix's df_structures?

Code: [Select]

[submodule "library/xml"]
path = library/xml
url = git://github.com/peterix/df-structures.git


[arclance]

Okay it makes it farther before it fails with angavrilov's branch of dfhack and df_structures.

Code: [Select]

[ 88%] Building CXX object plugins/stonesense/CMakeFiles/stonesense.dir/Creatures.cpp.o
In file included from /home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/Creatures.cpp:1:0:
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/common.h:2:0: warning: ignoring #pragma warning
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/common.h:3:0: warning: ignoring #pragma warning
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/common.h:4:0: warning: ignoring #pragma warning
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/Creatures.cpp: In function ‘void AssembleCreatureText(int, int, DFHack::Units::t_unit*, WorldSegment*)’:
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/Creatures.cpp:243:103: error: narrowing conversion of ‘drawx’ from ‘int’ to ‘float’ inside { }
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/Creatures.cpp:243:103: error: narrowing conversion of ‘drawy’ from ‘int’ to ‘float’ inside { }
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/Creatures.cpp: In function ‘void DrawCreatureText(int, int, DFHack::Units::t_unit*)’:
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/Creatures.cpp:370:45: warning: comparison between signed and unsigned integer expressions
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/Creatures.cpp: In function ‘bool hasLegendarySkill(df::unit*)’:
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/Creatures.cpp:412:38: warning: comparison between signed and unsigned integer expressions
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/Creatures.cpp: In function ‘void ReadCreaturesToSegment(DFHack::Core&, WorldSegment*)’:
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/Creatures.cpp:583:82: warning: comparison between signed and unsigned integer expressions
/home/arclance/0_Build/dfhack/angavrilov/dfhack_2012-12-26/plugins/stonesense/Creatures.cpp:607:62: warning: comparison between signed and unsigned integer expressions
make[2]: *** [plugins/stonesense/CMakeFiles/stonesense.dir/Creatures.cpp.o] Error 1
make[1]: *** [plugins/stonesense/CMakeFiles/stonesense.dir/all] Error 2
make: *** [all] Error 2
[code]

[Rose]

df-structures is the core that DF is based on, it's what says which parts of Df are what. it's needed.

[arclance]

df-structures is the core that DF is based on, it's what says which parts of Df are what. it's needed.

I changed it to angavrilov's the same way I changed stonesense to yours since you mentioned angavrilov's df_structures was needed.

Stonesense needs the latest Dfhack and Df-structures from Angavrilov's branch.

I just wondered why he was not using his branch of df_structures in his branch of dfhack.

[Rose]

It's supposed to be using his branch.

As for the other error, if that's the only one, then congrats, we're down to platform inconsistencies.

[arclance]

It's supposed to be using his branch.

As for the other error, if that's the only one, then congrats, we're down to platform inconsistencies.

It is not using his branch, the .gitmodules file is 10 months old and from a peterix commit.
That is the only error unless there are more that show up later in the build.