fixed paths

This commit is contained in:
2025-03-12 12:45:22 +03:00
parent 6a4040be3e
commit 24210c8bfb
3 changed files with 98 additions and 98 deletions

71
.gitignore vendored
View File

@@ -1,25 +1,25 @@
# Add any directories, files, or patterns you don't want to be tracked by version control # Add any directories, files, or patterns you don't want to be tracked by version control
*.o *.o
sapfor/experts/Sapfor_2017/.idea/ Sapfor/.idea/
sapfor/experts/Sapfor_2017/cmake-build-debug/ Sapfor/cmake-build-debug/
sapfor/experts/Sapfor_2017/.vs/ Sapfor/.vs/
sapfor/experts/Sapfor_2017/_bin/ Sapfor/_bin/
sapfor/experts/Sapfor_2017/_lib/ Sapfor/_lib/
sapfor/experts/Sapfor_2017/Inliner/x64/ Sapfor/Inliner/x64/
sapfor/experts/Sapfor_2017/Parser/x64/ Sapfor/Parser/x64/
sapfor/experts/Sapfor_2017/SageLib/x64/ Sapfor/SageLib/x64/
sapfor/experts/Sapfor_2017/SageNewSrc/x64/ Sapfor/SageNewSrc/x64/
sapfor/experts/Sapfor_2017/SageOldSrc/x64/ Sapfor/SageOldSrc/x64/
sapfor/experts/Sapfor_2017/Sapfor/x64/ Sapfor/Sapfor/x64/
sapfor/experts/Sapfor_2017/TransformCommonLib/x64/ Sapfor/TransformCommonLib/x64/
sapfor/experts/Sapfor_2017/TransformLib/x64/ Sapfor/TransformLib/x64/
sapfor/experts/Sapfor_2017/TransformUtils/x64/ Sapfor/TransformUtils/x64/
dvm/fdvm/trunk/.svn/ dvm/fdvm/trunk/.svn/
sapfor/experts/Sapfor_2017/.svn/ Sapfor/.svn/
sapfor/transformers sapfor/transformers
sapfor/transformers/.svn/ sapfor/transformers/.svn/
sapfor/experts/Sapfor_2017/_src/boost Sapfor/_src/boost
sapfor/experts/Sapfor_2017/Sapfor/Sapfor.vcxproj.user Sapfor/Sapfor/Sapfor.vcxproj.user
sapfor/analyzers/ sapfor/analyzers/
sapfor/general/ sapfor/general/
sapfor/generators/ sapfor/generators/
@@ -30,11 +30,11 @@ sapfor/experts/expert_maxim_last_version/
sapfor/experts/visualizer/ sapfor/experts/visualizer/
sapfor/.svn/ sapfor/.svn/
sapfor/experts/Sapfor_2017/cmake-build-debug/ Sapfor/cmake-build-debug/
sapfor/experts/Sapfor_2017/build/ Sapfor/build/
sapfor/experts/Sapfor_2017/Inliner/build/ Sapfor/Inliner/build/
sapfor/experts/Sapfor_2017/Parser/build/ Sapfor/Parser/build/
sapfor/experts/Sapfor_2017/Sapfor/*.o Sapfor/Sapfor/*.o
sapfor/transformers/ftransform/trunk/cmake-build-debug/ sapfor/transformers/ftransform/trunk/cmake-build-debug/
sapfor/transformers/ftransform/trunk/build/ sapfor/transformers/ftransform/trunk/build/
sapfor/transformers/ftransform/trunk/parser/build/ sapfor/transformers/ftransform/trunk/parser/build/
@@ -57,22 +57,23 @@ dvm/tools/omp-pa/
dvm/CMakeLists.txt dvm/CMakeLists.txt
dvm/.svn/ dvm/.svn/
dvm/fdvm/branches/ dvm/fdvm/branches/
sapfor/experts/Sapfor_2017/TransformCommonLib/TransformCommonLib.vcxproj.user Sapfor/TransformCommonLib/TransformCommonLib.vcxproj.user
sapfor/experts/Sapfor_2017/SageOldSrc/SageOldSrc.vcxproj.user Sapfor/SageOldSrc/SageOldSrc.vcxproj.user
sapfor/experts/Sapfor_2017/SageNewSrc/SageNewSrc.vcxproj.user Sapfor/SageNewSrc/SageNewSrc.vcxproj.user
sapfor/experts/Sapfor_2017/SageLib/SageLib.vcxproj.user Sapfor/SageLib/SageLib.vcxproj.user
sapfor/experts/Sapfor_2017/Inliner/Inliner.vcxproj.user Sapfor/Inliner/Inliner.vcxproj.user
sapfor/experts/Sapfor_2017/TransformUtils/TransformUtils.vcxproj.user Sapfor/TransformUtils/TransformUtils.vcxproj.user
sapfor/experts/Sapfor_2017/Parser/Parser.vcxproj.user Sapfor/Parser/Parser.vcxproj.user
.vscode/* .vscode/*
.vs/ .vs/
**/**/.DS_Store **/**/.DS_Store
sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj.user Sapfor/Sapc++/Sapc++/Sapc++.vcxproj.user
sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj.filters Sapfor/Sapc++/Sapc++/Sapc++.vcxproj.filters
sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj Sapfor/Sapc++/Sapc++/Sapc++.vcxproj
sapfor/experts/Sapfor_2017/Sapc++/Sapc++/x64/ Sapfor/Sapc++/Sapc++/x64/
sapfor/experts/Sapfor_2017/Sapc++/x64/ Sapfor/Sapc++/x64/
/build /build
sapfor/experts/Sapfor_2017/out/ Sapfor/out/
Sapfor/_bin/*

View File

@@ -13,15 +13,15 @@ add_definitions("-D YYDEBUG")
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(fdvm_include ../../../dvm/fdvm/trunk/include) set(fdvm_include ../dvm/fdvm/trunk/include)
set(sage_include_1 ../../../dvm/fdvm/trunk/Sage/lib/include) set(sage_include_1 ../dvm/fdvm/trunk/Sage/lib/include)
set(sage_include_2 ../../../dvm/fdvm/trunk/Sage/h/) set(sage_include_2 ../dvm/fdvm/trunk/Sage/h/)
set(libdb_sources ../../../dvm/fdvm/trunk/Sage/lib/oldsrc) set(libdb_sources ../dvm/fdvm/trunk/Sage/lib/oldsrc)
set(sage_sources ../../../dvm/fdvm/trunk/Sage/lib/newsrc) set(sage_sources ../dvm/fdvm/trunk/Sage/lib/newsrc)
set(sagepp_sources ../../../dvm/fdvm/trunk/Sage/Sage++) set(sagepp_sources ../dvm/fdvm/trunk/Sage/Sage++)
set(parser_sources ../../../dvm/fdvm/trunk/parser) set(parser_sources ../dvm/fdvm/trunk/parser)
set(pppa_sources ../../../dvm/tools/pppa/trunk/src) set(pppa_sources ../dvm/tools/pppa/trunk/src)
set(zlib_sources ../../../dvm/tools/Zlib) set(zlib_sources ../dvm/tools/Zlib)
# Read pathes to external sapfor directories # Read pathes to external sapfor directories
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/paths.txt") if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/paths.txt")

View File

@@ -1,11 +1,10 @@
fdvm_include=../../../dvm/fdvm/trunk/include/ fdvm_include=../dvm/fdvm/trunk/include/
sage_include_1=../../../dvm/fdvm/trunk/Sage/lib/include/ sage_include_1=../dvm/fdvm/trunk/Sage/lib/include/
sage_include_2=../../../dvm/fdvm/trunk/Sage/h/ sage_include_2=../dvm/fdvm/trunk/Sage/h/
fdvm_sources=../../../dvm/fdvm/trunk/fdvm/ fdvm_sources=../dvm/fdvm/trunk/fdvm/
libdb_sources=../../../dvm/fdvm/trunk/Sage/lib/oldsrc/ libdb_sources=../dvm/fdvm/trunk/Sage/lib/oldsrc/
sage_sources=../../../dvm/fdvm/trunk/Sage/lib/newsrc/ sage_sources=../dvm/fdvm/trunk/Sage/lib/newsrc/
sagepp_sources=../../../dvm/fdvm/trunk/Sage/Sage++/ sagepp_sources=../dvm/fdvm/trunk/Sage/Sage++/
parser_sources=../../../dvm/fdvm/trunk/parser/ parser_sources=../dvm/fdvm/trunk/parser/
inline_expansion_sources=../../../dvm/fdvm/trunk/InlineExpansion/ pppa_sources=../dvm/tools/pppa/trunk/src/
pppa_sources=../../../dvm/tools/pppa/trunk/src/ zlib_sources=../dvm/tools/Zlib/
zlib_sources=../../../dvm/tools/Zlib/