I've been looking for a solid compilation (a monography, or an encyclopedia) on pre-modern weapons and warfare.

Can you recommend a book or two to me?

The scope I'm looking for is rather broad. I.e.:

• Date range: 4000BC - 1700AD
• The scope should include weapons all around the world (in fact, exotic weapons are welcome).
• Not interested in firearms (only cold weapons)

These are what I'm looking for:

• A book on evolution of warfare (i.e. weapon advantages, tactics, and such - to understand the basic underlying principles)
• A book full of images/illustrations of weapons (important, as I'm intending to use these as art references)