build: Fix building for spice2x-20230929
> resolve third party libraries not building > force include stdint.h in place of cstdint missing from windows.h now > to be reverted after updates to spice2x master
This commit is contained in:
+1
@@ -16,6 +16,7 @@
|
|||||||
<env name="_G_debug" value="true" />
|
<env name="_G_debug" value="true" />
|
||||||
</envs>
|
</envs>
|
||||||
<method v="2">
|
<method v="2">
|
||||||
|
<option name="RunConfigurationTask" enabled="true" run_configuration_name="Clion[Init]" run_configuration_type="ShConfigurationType" />
|
||||||
<option name="RunConfigurationTask" enabled="false" run_configuration_name="spicetools_spice64" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Debug_x64[WIN_32]" />
|
<option name="RunConfigurationTask" enabled="false" run_configuration_name="spicetools_spice64" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Debug_x64[WIN_32]" />
|
||||||
</method>
|
</method>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
+1
@@ -16,6 +16,7 @@
|
|||||||
<env name="_G_debug" value="true" />
|
<env name="_G_debug" value="true" />
|
||||||
</envs>
|
</envs>
|
||||||
<method v="2">
|
<method v="2">
|
||||||
|
<option name="RunConfigurationTask" enabled="true" run_configuration_name="Clion[Init]" run_configuration_type="ShConfigurationType" />
|
||||||
<option name="RunConfigurationTask" enabled="false" run_configuration_name="spicetools_cfg" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Debug_x86[WIN_32]" />
|
<option name="RunConfigurationTask" enabled="false" run_configuration_name="spicetools_cfg" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Debug_x86[WIN_32]" />
|
||||||
<option name="RunConfigurationTask" enabled="false" run_configuration_name="spicetools_spice" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Debug_x86[WIN_32]" />
|
<option name="RunConfigurationTask" enabled="false" run_configuration_name="spicetools_spice" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Debug_x86[WIN_32]" />
|
||||||
</method>
|
</method>
|
||||||
|
|||||||
+1
@@ -16,6 +16,7 @@
|
|||||||
<env name="_G_debug" value="false" />
|
<env name="_G_debug" value="false" />
|
||||||
</envs>
|
</envs>
|
||||||
<method v="2">
|
<method v="2">
|
||||||
|
<option name="RunConfigurationTask" enabled="true" run_configuration_name="Clion[Init]" run_configuration_type="ShConfigurationType" />
|
||||||
<option name="RunConfigurationTask" enabled="true" run_configuration_name="spicetools_spice64" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Release_x64[WIN_32]" />
|
<option name="RunConfigurationTask" enabled="true" run_configuration_name="spicetools_spice64" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Release_x64[WIN_32]" />
|
||||||
</method>
|
</method>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
+1
@@ -16,6 +16,7 @@
|
|||||||
<env name="_G_debug" value="false" />
|
<env name="_G_debug" value="false" />
|
||||||
</envs>
|
</envs>
|
||||||
<method v="2">
|
<method v="2">
|
||||||
|
<option name="RunConfigurationTask" enabled="true" run_configuration_name="Clion[Init]" run_configuration_type="ShConfigurationType" />
|
||||||
<option name="RunConfigurationTask" enabled="true" run_configuration_name="spicetools_cfg" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Release_x86[WIN_32]" />
|
<option name="RunConfigurationTask" enabled="true" run_configuration_name="spicetools_cfg" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Release_x86[WIN_32]" />
|
||||||
<option name="RunConfigurationTask" enabled="false" run_configuration_name="spicetools_spice" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Release_x86[WIN_32]" />
|
<option name="RunConfigurationTask" enabled="false" run_configuration_name="spicetools_spice" run_configuration_type="CMakeRunConfiguration" run_configuration_target="CMakeBuildProfile:Release_x86[WIN_32]" />
|
||||||
</method>
|
</method>
|
||||||
|
|||||||
@@ -670,3 +670,21 @@ set_target_properties(spicetools_spice64 spicetools_stubs_kbt64 spicetools_stubs
|
|||||||
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/archive64"
|
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/archive64"
|
||||||
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/spicetools/64"
|
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/spicetools/64"
|
||||||
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/spicetools/64")
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/spicetools/64")
|
||||||
|
|
||||||
|
# force include (temporary)
|
||||||
|
function(target_force_include _target)
|
||||||
|
cmake_parse_arguments(_IFORCE "" "" "QUOTE;REL_PATH;ABS_PATH" ${ARGN})
|
||||||
|
get_target_property(_path_root ${_target} SOURCE_DIR)
|
||||||
|
list(TRANSFORM _IFORCE_QUOTE PREPEND "SHELL:-include ")
|
||||||
|
list(TRANSFORM _IFORCE_REL_PATH PREPEND "SHELL:-include ${_path_root}/")
|
||||||
|
list(TRANSFORM _IFORCE_ABS_PATH PREPEND "SHELL:-include ")
|
||||||
|
target_compile_options(${_target} PRIVATE
|
||||||
|
${_IFORCE_QUOTE} ${_IFORCE_REL_PATH} ${_IFORCE_ABS_PATH})
|
||||||
|
endfunction()
|
||||||
|
target_force_include(spicetools_spice QUOTE stdint.h)
|
||||||
|
target_force_include(spicetools_stubs_kbt QUOTE stdint.h)
|
||||||
|
target_force_include(spicetools_stubs_kld QUOTE stdint.h)
|
||||||
|
target_force_include(spicetools_spice64 QUOTE stdint.h)
|
||||||
|
target_force_include(spicetools_stubs_kbt64 QUOTE stdint.h)
|
||||||
|
target_force_include(spicetools_stubs_kld64 QUOTE stdint.h)
|
||||||
|
target_force_include(spicetools_cfg QUOTE stdint.h)
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ run_deploy_all() {
|
|||||||
source <(head -n +20 ./build_all.sh)
|
source <(head -n +20 ./build_all.sh)
|
||||||
|
|
||||||
# Run deploy in build_all.sh
|
# Run deploy in build_all.sh
|
||||||
|
set +e
|
||||||
source <(tail -n +150 ./build_all.sh | head -n -3 | sed 's~.*pushd ${OUTDIR}/.. > /dev/null*~\tpushd ${OUTDIR} > /dev/null~')
|
source <(tail -n +150 ./build_all.sh | head -n -3 | sed 's~.*pushd ${OUTDIR}/.. > /dev/null*~\tpushd ${OUTDIR} > /dev/null~')
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,6 +58,13 @@ run_distribute_all() {
|
|||||||
source <(tail -n +150 ./build_all.sh | head -n -3 | sed 's~.*pushd ${OUTDIR}/.. > /dev/null*~\tpushd ${OUTDIR} > /dev/null~')
|
source <(tail -n +150 ./build_all.sh | head -n -3 | sed 's~.*pushd ${OUTDIR}/.. > /dev/null*~\tpushd ${OUTDIR} > /dev/null~')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
run_clion_init() {
|
||||||
|
# Init cmake.sh only
|
||||||
|
source <(sed -n '/__BUILDALLINIT__/{:a;n;/__BUILDALLINIT__/q;p;$!ba}' "$0")
|
||||||
|
|
||||||
|
# Clion specific first-time setup
|
||||||
|
}
|
||||||
|
|
||||||
# Sanity checks
|
# Sanity checks
|
||||||
[ -d "external/cmake-various/toolchain" ] || { echo "Toolchain not found" ; exit 1; }
|
[ -d "external/cmake-various/toolchain" ] || { echo "Toolchain not found" ; exit 1; }
|
||||||
[ "$(md5sum ./build_all.sh | cut -c -32)" = "9a89bba3fa2435983e5bce423d0f4a61" ] || { echo "Version mismatch for build_all.sh " ; exit 1; }
|
[ "$(md5sum ./build_all.sh | cut -c -32)" = "9a89bba3fa2435983e5bce423d0f4a61" ] || { echo "Version mismatch for build_all.sh " ; exit 1; }
|
||||||
|
|||||||
Vendored
-1
@@ -45,7 +45,6 @@ IncludeCategories:
|
|||||||
- Regex: '.*'
|
- Regex: '.*'
|
||||||
Priority: 3
|
Priority: 3
|
||||||
IncludeIsMainRegex: '(_test|_win|_linux|_mac|_ios|_osx|_null)?$'
|
IncludeIsMainRegex: '(_test|_win|_linux|_mac|_ios|_osx|_null)?$'
|
||||||
IndentCaseLabels: false
|
|
||||||
IndentWidth: 4
|
IndentWidth: 4
|
||||||
IndentWrappedFunctionNames: false
|
IndentWrappedFunctionNames: false
|
||||||
KeepEmptyLinesAtTheStartOfBlocks: false
|
KeepEmptyLinesAtTheStartOfBlocks: false
|
||||||
|
|||||||
Vendored
-2
@@ -323,8 +323,6 @@ struct GenericStringRef {
|
|||||||
|
|
||||||
GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
|
GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
|
||||||
|
|
||||||
GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
|
|
||||||
|
|
||||||
//! implicit conversion to plain CharType pointer
|
//! implicit conversion to plain CharType pointer
|
||||||
operator const Ch *() const { return s; }
|
operator const Ch *() const { return s; }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user