MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/github/buildingplan'

develop
falconne 2013-01-27 23:42:28 +13:00
parent fdcb248ea0 6546af94ee
commit 58125a57a7
4 changed files with 1534 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
Unescape Escape View File

@ -113,7 +113,8 @@ IF(UNIX)
SET(CMAKE_C_FLAGS "-fvisibility=hidden -m32 -march=i686 -mtune=generic")
ELSEIF(MSVC)
# for msvc, tell it to always use 8-byte pointers to member functions to avoid confusion
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /vmg /vmm")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /vmg /vmm /MP")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od")
ENDIF()
# use shared libraries for protobuf

1
plugins/CMakeLists.txt
Unescape Escape View File

@ -129,6 +129,7 @@ if (BUILD_SUPPORTED)
# not yet. busy with other crud again...
#DFHACK_PLUGIN(versionosd versionosd.cpp)
DFHACK_PLUGIN(misery misery.cpp)
DFHACK_PLUGIN(buildingplan buildingplan.cpp)
endif()

1530
plugins/buildingplan.cpp
View File

File diff suppressed because it is too large Load Diff

2
plugins/workflow.cpp
Unescape Escape View File

@ -1205,7 +1205,7 @@ static void map_job_items(color_ostream &out)
df::item_flags bad_flags;
bad_flags.whole = 0;
#define F(left_margin) bad_flags.bits.left_margin = true;
#define F(x) bad_flags.bits.x = true;
F(dump); F(forbid); F(garbage_collect);
F(hostile); F(on_fire); F(rotten); F(trader);
F(in_building); F(construction); F(artifact1);