luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows fix: run ngspice in $netlist_dir; add res3.sym into Windows package, update instructions for compiling Cairo`s debug version

This commit is contained in:
Stefan Frederik 2022-07-29 23:00:34 +02:00
parent 62b4db861b
commit 31646cf357
4 changed files with 1905 additions and 1896 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
XSchemWin/README_WIN
View File

@ -114,9 +114,10 @@ INSTRUCTIONS TO COMPILE CAIRO AND COMPILE XSCHEM WITH IT ON VISUAL STUDIO 2022
b. Select Release_static; x64 and build solution (library file is created in freetype\objs\x64\Release Static\freetype.lib) b. Select Release_static; x64 and build solution (library file is created in freetype\objs\x64\Release Static\freetype.lib)
4. Compile cairo: Open VS 2019 solution in projects/cairo.sln (Retarget solution if using VS 2022) 4. Compile cairo: Open VS 2019 solution in projects/cairo.sln (Retarget solution if using VS 2022)
a. Change to Release, x64 build a. Change to Release, x64 build
b. Change cairo > Properties > Librarian > General > freetype271.lib to freetype.lib (Optional: Also do this for Debug,x64 build if needed) b. Change cairo > Properties > Librarian > General > freetype271.lib to freetype.lib (Optional: Also do this for Debug,x64 build if needed, freetype271d.lib)
c. cairo > Properties > Configuration Properties > VC++ Directories, append the following to Library directories for freetype.lib compiled in (3): c. cairo > Properties > Configuration Properties > VC++ Directories, append the following to Library directories for freetype.lib compiled in (3):
;$(ProjectDir)../../freetype/objs/x64/Release Static ;$(ProjectDir)../../freetype/objs/x64/Release Static
For Debug,x64 build: ;$(ProjectDir)../../freetype/objs/x64/Debug Static
d. Edit cairo > Header Files > cairo-features.h by adding the following line "#define CAIRO_HAS_XLIB_SURFACE 1" at the end before the last #endif d. Edit cairo > Header Files > cairo-features.h by adding the following line "#define CAIRO_HAS_XLIB_SURFACE 1" at the end before the last #endif
e. cairo.lib and pixman.lib are in cairo_win/projects/x64/Release e. cairo.lib and pixman.lib are in cairo_win/projects/x64/Release
5. Setup xschem VS 2022 to compile with cairo library 5. Setup xschem VS 2022 to compile with cairo library
@ -129,5 +130,5 @@ INSTRUCTIONS TO COMPILE CAIRO AND COMPILE XSCHEM WITH IT ON VISUAL STUDIO 2022
* Properties > Linker > Input > Additional Dependencies: Add ;cairo.lib;pixman.lib;zlib.lib;libpng.lib;freetype.lib; * Properties > Linker > Input > Additional Dependencies: Add ;cairo.lib;pixman.lib;zlib.lib;libpng.lib;freetype.lib;
For Debug, x64 For Debug, x64
* Properties > VC++ Directories > Include: ;cairo_win\cairo\src;cairo_win\projects\cairo\src; * Properties > VC++ Directories > Include: ;cairo_win\cairo\src;cairo_win\projects\cairo\src;
Libraries: ;cairo_win\projects\x64\Debug;cairo_win\libs;cairo_win\freetype\objs\x64\Release Static Libraries: ;cairo_win\projects\x64\Debug;cairo_win\libs;cairo_win\freetype\objs\x64\Debug Static
* Properties > Linker > Input > Additional Dependencies: Add ;cairo.lib;pixman.lib;zlibd.lib;libpngd.lib;freetype.lib; * Properties > Linker > Input > Additional Dependencies: Add ;cairo.lib;pixman.lib;zlibd.lib;libpngd.lib;freetype.lib;

3790
XSchemWin/XSchemWix/heat_xschem_library.wxs
View File

File diff suppressed because it is too large Load Diff

4
XSchemWin/XSchemWix/xschem_library.wxs
View File

@ -267,6 +267,9 @@
<Component Id="cmpD523FFEB5C4A5B2C9B32756959301696" Guid="{01A20014-96EB-4544-B6AA-797BBB1A2EBB}"> <Component Id="cmpD523FFEB5C4A5B2C9B32756959301696" Guid="{01A20014-96EB-4544-B6AA-797BBB1A2EBB}">
<File Id="fil07AF1F31916E0F8FBCFAE8B3B4DB75E3" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\res.sym" /> <File Id="fil07AF1F31916E0F8FBCFAE8B3B4DB75E3" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\res.sym" />
</Component> </Component>
<Component Id="cmp5AB2F8E41383F42905B404123416AD43" Guid="{7D5B92A6-8599-4C82-A0AB-F3200EB2A4CE}">
<File Id="filB76DCCC73AD4F01C11E94A265BAE001E" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\res3.sym" />
</Component>
<Component Id="cmpA6D9B275607613A4C61E8980D499B751" Guid="{B46713C9-9948-41A6-BF94-AD7CD9F6FA12}"> <Component Id="cmpA6D9B275607613A4C61E8980D499B751" Guid="{B46713C9-9948-41A6-BF94-AD7CD9F6FA12}">
<File Id="fil7516301DE3046985A51F2FE229A3DB1A" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\res_ac.sym" /> <File Id="fil7516301DE3046985A51F2FE229A3DB1A" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\devices\res_ac.sym" />
</Component> </Component>
@ -5503,6 +5506,7 @@
<ComponentRef Id="cmpCC5706A28CEB5E7599AB711F3F854B84" /> <ComponentRef Id="cmpCC5706A28CEB5E7599AB711F3F854B84" />
<ComponentRef Id="cmp61952A114454A7C708C7CFDD2C41377F" /> <ComponentRef Id="cmp61952A114454A7C708C7CFDD2C41377F" />
<ComponentRef Id="cmpD523FFEB5C4A5B2C9B32756959301696" /> <ComponentRef Id="cmpD523FFEB5C4A5B2C9B32756959301696" />
<ComponentRef Id="cmp5AB2F8E41383F42905B404123416AD43" />
<ComponentRef Id="cmpA6D9B275607613A4C61E8980D499B751" /> <ComponentRef Id="cmpA6D9B275607613A4C61E8980D499B751" />
<ComponentRef Id="cmpE33D206A79E72DCC203BF9219CECA21A" /> <ComponentRef Id="cmpE33D206A79E72DCC203BF9219CECA21A" />
<ComponentRef Id="cmpD97AE943007C3AC19332BBE4DD1231CC" /> <ComponentRef Id="cmpD97AE943007C3AC19332BBE4DD1231CC" />

2
src/xschem.tcl
View File

@ -1178,7 +1178,7 @@ proc simulate {{callback {}}} {
if {$OS == "Windows"} { if {$OS == "Windows"} {
# $cmd cannot be surrounded by {} as exec will change forward slash to backward slash # $cmd cannot be surrounded by {} as exec will change forward slash to backward slash
if { $callback ne {} } { if { $callback ne {} } {
uplevel #0 "eval $callback" uplevel #0 "eval cd $netlist_dir; $callback"
} }
#eval exec {cmd /V /C "cd $netlist_dir&&$cmd} #eval exec {cmd /V /C "cd $netlist_dir&&$cmd}
eval exec $cmd & eval exec $cmd &