Merge pull request #489 from Azaezel/alpha40/zipPassPunt

expose a zip file password cmake config option

Engine/source/core/util/zip/zipArchive.h

@@ -36,8 +36,6 @@
 /// @addtogroup zip_group Zip Code
 // @{
 
-/// Password to use when opening encrypted zip files. Change this to whatever the password is for your zips.
-#define DEFAULT_ZIP_PASSWORD     "changeme"
 
 class ZipTestWrite;
 class ZipTestRead;
@@ -235,7 +233,7 @@ class ZipTempStream;
 /// exists and may be released as a resource in the future.
 /// 
 /// To set the password used for zips, you need to modify the #DEFAULT_ZIP_PASSWORD
-/// define in core/zip/zipArchive.h. This password will be used for all zips that
+/// define in torqueConfig.h. This password will be used for all zips that
 /// require a password. The default password is changeme. This may be used by
 /// TGB Binary users to test encrypted zips with their game. Shipping with the
 /// default password is not recommended for obvious reasons.

Tools/CMake/torque3d.cmake

@@ -57,6 +57,8 @@ mark_as_advanced(TORQUE_BASIC_LIGHTING)
 option(TORQUE_SFX_DirectX "DirectX Sound" OFF)
 mark_as_advanced(TORQUE_SFX_DirectX)
 option(TORQUE_SFX_OPENAL "OpenAL Sound" ON)
+mark_as_advanced(TORQUE_APP_PASSWORD)
+set(TORQUE_APP_PASSWORD "changeme" CACHE STRING "zip file password")
 #windows uses openal-soft
 if(WIN32)
     #disable a few things that are not required

Tools/CMake/torqueConfig.h.in

@@ -216,4 +216,7 @@
 //use sdl backend?
 #if defined(TORQUE_SDL)
 #include <SDL.h>
-#endif
+#endif
+
+/// Password to use when opening encrypted zip files. Change this to whatever the password is for your zips.
+#define DEFAULT_ZIP_PASSWORD     "@TORQUE_APP_PASSWORD@"