suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve windows issues

Browse Source
This commit is contained in:
Stefan Troeger 2014-01-25 14:58:36 +01:00 committed by Stefan Tröger
parent 18aceffce8
commit 3b4db93332
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Mod/Assembly/App/CMakeLists.txt
View File

@ -4,8 +4,6 @@ else(MSVC)
add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H)
endif(MSVC)
#add_definitions( -DUSE_LOGGING )
include_directories(
${CMAKE_SOURCE_DIR}/src
${CMAKE_BINARY_DIR}/src
@ -58,13 +56,27 @@ SET(Module_SRCS
)
SOURCE_GROUP("Module" FILES ${Module_SRCS})
#externalisation is not possible for msvc as a stupid bug prevents the function definition resolving
if(MSVC)
set(Solver_SRC )
elseif(MSVC)
set(Solver_SRC Solver/solver_3d_ext1.cpp
Solver/solver_3d_ext2.cpp
Solver/solver_3d_ext3.cpp
)
if(FREECAD_ASSEMBLY_DEBUG_FACILITIES)
set(Solver_SRC ${Solver_SRC}
Solver/solver_state_ext1.cpp
Solver/solver_state_ext2.cpp
)
endif(FREECAD_ASSEMBLY_DEBUG_FACILITIES)
add_definitions(-DDCM_EXTERNAL_CORE)
add_definitions(-DDCM_EXTERNAL_3D)
add_definitions(-DDCM_EXTERNAL_STATE)
endif(MSVC)
set(Solver_SRC Solver/solver_3d_ext1.cpp
Solver/solver_3d_ext2.cpp
Solver/solver_3d_ext3.cpp
Solver/solver_state_ext1.cpp
Solver/solver_state_ext2.cpp
)
SOURCE_GROUP("Solver" FILES ${Solver_SRC})
SET(Python_SRCS

4
src/Mod/Assembly/App/Solver/Solver.h
View File

@ -23,10 +23,6 @@
#ifndef SOLVER_H
#define SOLVER_H
#define DCM_EXTERNAL_CORE
#define DCM_EXTERNAL_3D
#define DCM_EXTERNAL_STATE
#include "PreCompiled.h"
#include "opendcm/core.hpp"

2
src/Mod/Assembly/App/opendcm/core/imp/clustergraph_imp.hpp
View File

@ -772,7 +772,7 @@ void ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::setObject(key
template< typename edge_prop, typename vertex_prop, typename cluster_prop, typename objects>
template<typename Obj>
std::pair< typename ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::template object_iterator<Obj>, typename ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::template object_iterator<Obj> >
std::pair< typename ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::object_iterator<Obj>, typename ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::object_iterator<Obj> >
ClusterGraph<edge_prop, vertex_prop, cluster_prop, objects>::getObjects(LocalEdge k) {
std::vector<edge_bundle_single>& vec = fusion::at_c<1> ((*this) [k]);

2
src/Mod/Assembly/App/opendcm/core/kernel.hpp
View File

@ -70,7 +70,7 @@ struct iterations {
typedef setting_property kind;
struct default_value {
int operator()() {
return 5e3;
return int(5e3);
};
};
};