To generate a square wave and triangle wave together, just hook a Schmitt trigger to an op amp configured as integrator (resistor from input to (-) node, feedback capacitor from op amp output to (-) node. The output of the op amp then is fed to the Schmitt trigger (a '555 does this without the op amp, but its triangle waves are curvey because of that).
The result is a square wave and a triangle wave, both of constant amplitude, which changes frequency with a single variable resistor (the integrator input resistor).
SO, now you want to mix a square and triangle? If you generate them by the method above, fundamentals ARE OUT OF PHASE by ninety degrees, and so are all of the harmonics. You get neither cancellation nor reinforcement by any simple summing.