adds MSVC compatibility fixes
This commit is contained in:
		
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -11,3 +11,4 @@ | |||||||
| /coverage.info | /coverage.info | ||||||
| /output.txt | /output.txt | ||||||
| /output.trc | /output.trc | ||||||
|  | CMakeSettings.json | ||||||
|   | |||||||
| @@ -7,7 +7,7 @@ project(ecosystem-vp LANGUAGES C CXX VERSION 1.0.0) | |||||||
|  |  | ||||||
| option(ENABLE_SCV "Enable the use of SCV" ON) | option(ENABLE_SCV "Enable the use of SCV" ON) | ||||||
| option(LIBS_ONLY "Just build the shared libraries needed to build the VP" OFF) | option(LIBS_ONLY "Just build the shared libraries needed to build the VP" OFF) | ||||||
| option(NO_FW_BUILD "Disable the automatic rebuild of firmware running on the VP" OFF) | option(FW_BUILD "Enable the automatic rebuild of firmware running on the VP" ON) | ||||||
| option(EN_EXT_DEBUG "Enable extended debug output at runtime" OFF) | option(EN_EXT_DEBUG "Enable extended debug output at runtime" OFF) | ||||||
| option(ENABLE_COVERAGE "Enable code coverage" OFF) | option(ENABLE_COVERAGE "Enable code coverage" OFF) | ||||||
| option(ENABLE_SANITIZER "Enable address sanitizer" OFF) | option(ENABLE_SANITIZER "Enable address sanitizer" OFF) | ||||||
| @@ -79,7 +79,7 @@ conan_cmake_autodetect(settings) | |||||||
| conan_install() | conan_install() | ||||||
| # needed when using CentOS devenv-7 or -8 and boost does not build because of missing GLIBCXX version                 | # needed when using CentOS devenv-7 or -8 and boost does not build because of missing GLIBCXX version                 | ||||||
| #conan_install(BUILD b2 missing)                     | #conan_install(BUILD b2 missing)                     | ||||||
| find_package(tcc) | find_package(tcc QUIET) | ||||||
| find_package(elfio) | find_package(elfio) | ||||||
| find_package(fmt) | find_package(fmt) | ||||||
| find_package(gsl-lite) | find_package(gsl-lite) | ||||||
| @@ -123,7 +123,7 @@ endif() | |||||||
| if(NOT LIBS_ONLY) | if(NOT LIBS_ONLY) | ||||||
| 	add_subdirectory(src) | 	add_subdirectory(src) | ||||||
| endif() | endif() | ||||||
| if(NOT NO_FW_BUILD) | if(FW_BUILD) | ||||||
| 	add_custom_target(fw-hello-world ALL COMMAND make -C fw/hello-world | 	add_custom_target(fw-hello-world ALL COMMAND make -C fw/hello-world | ||||||
|                    USES_TERMINAL WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) |                    USES_TERMINAL WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) | ||||||
| endif() | endif() | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								scc
									
									
									
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								scc
									
									
									
									
									
								
							 Submodule scc updated: 93a5676fec...bee44d83d0
									
								
							| @@ -16,8 +16,13 @@ | |||||||
|  |  | ||||||
| #include <boost/program_options.hpp> | #include <boost/program_options.hpp> | ||||||
| #include <tgc_vp/tb.h> | #include <tgc_vp/tb.h> | ||||||
|  | #include <iostream> | ||||||
| #include <fstream> | #include <fstream> | ||||||
| #include <sstream> | #include <sstream> | ||||||
|  | #ifdef ERROR | ||||||
|  | #undef ERROR | ||||||
|  | #endif | ||||||
|  |  | ||||||
| const std::string core_path{"tb.top.core_complex"}; | const std::string core_path{"tb.top.core_complex"}; | ||||||
|  |  | ||||||
| using namespace sysc; | using namespace sysc; | ||||||
|   | |||||||
| @@ -15,8 +15,10 @@ tb::tb(const sc_core::sc_module_name &nm): sc_core::sc_module(nm) { | |||||||
|         gpio_s[i].in(top.pins_o[i]); |         gpio_s[i].in(top.pins_o[i]); | ||||||
|         top.pins_i[i](gpio_s[i].out); |         top.pins_i[i](gpio_s[i].out); | ||||||
|     } |     } | ||||||
|  | #ifndef WIN32 | ||||||
|     // terminal |     // terminal | ||||||
|     terminal.tx_o(gpio_s[16].in); |     terminal.tx_o(gpio_s[16].in); | ||||||
|     gpio_s[17].out(terminal.rx_i); |     gpio_s[17].out(terminal.rx_i); | ||||||
|  | #endif | ||||||
| } | } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -21,7 +21,9 @@ public: | |||||||
|     tgc_vp::rst_gen rst_gen{"rst_gen"}; |     tgc_vp::rst_gen rst_gen{"rst_gen"}; | ||||||
|     sc_core::sc_vector<tlm::scc::tlm_signal<sc_dt::sc_logic>> gpio_s{"gpio_s", 32}; |     sc_core::sc_vector<tlm::scc::tlm_signal<sc_dt::sc_logic>> gpio_s{"gpio_s", 32}; | ||||||
|     sc_core::sc_signal<bool> rst_n{"rst_n"}; |     sc_core::sc_signal<bool> rst_n{"rst_n"}; | ||||||
|  | #ifndef WIN32 // Seasocks not available under windows | ||||||
|     vpvper::generic::terminal terminal{"terminal"}; |     vpvper::generic::terminal terminal{"terminal"}; | ||||||
|  | #endif | ||||||
| }; | }; | ||||||
|  |  | ||||||
| } /* namespace tgc_vp */ | } /* namespace tgc_vp */ | ||||||
|   | |||||||
 Submodule tgc-iss/dbt-rise-core updated: 44acf8a559...159cabb63c
									
								
							 Submodule tgc-iss/dbt-rise-tgc updated: c054d75717...4876f18ba9
									
								
							
							
								
								
									
										2
									
								
								vpvper
									
									
									
									
									
								
							
							
								
								
								
								
								
							
						
						
									
										2
									
								
								vpvper
									
									
									
									
									
								
							 Submodule vpvper updated: 11e6dc5926...74a5fffd1a
									
								
							
		Reference in New Issue
	
	Block a user