summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2005-07-11 18:28:21 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2005-07-11 18:28:21 +0000
commit4193de326e7de48c30aec7e5737f0279f3e213ae (patch)
tree68aab9b17c5c0bdce3c9e5f53391261912cf78b3
parentb7915758cd909d309b2c296516c0717a59f843a3 (diff)
downloadMPC-4193de326e7de48c30aec7e5737f0279f3e213ae.tar.gz
ChangeLogTag: Mon Jul 11 13:26:52 2005 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog13
-rw-r--r--templates/nmakedll.mpt16
-rw-r--r--templates/nmakeexe.mpt16
-rw-r--r--templates/vc8.mpd2
4 files changed, 30 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 10dea21d..8487b418 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Mon Jul 11 13:26:52 2005 Chad Elliott <elliott_c@ociweb.com>
+
+ * templates/nmakedll.mpt:
+ * templates/nmakeexe.mpt:
+
+ Switch from /GX to /EHs (which is supported by vc6) to avoid build
+ warnings using the Visual Studio 8 compiler with nmake.
+
+ * templates/vc8.mpd:
+
+ Changed the default character set to 0 instead of 1. This is now
+ the same as the vc7 template.
+
Fri Jul 8 11:47:37 2005 Chad Elliott <elliott_c@ociweb.com>
* modules/ProjectCreator.pm:
diff --git a/templates/nmakedll.mpt b/templates/nmakedll.mpt
index 8b04e1f0..0af9ae7a 100644
--- a/templates/nmakedll.mpt
+++ b/templates/nmakedll.mpt
@@ -26,7 +26,7 @@ Release {
type_code = 0x0102
use_debug_libraries = 0
optimize = 1
- compile_flags = /W3 /GX /MD /GR
+ compile_flags = /W3 /EHs /MD /GR
defines = NDEBUG
compile_flags_removed = /YX
output_dir = Release
@@ -42,7 +42,7 @@ Debug {
type_code = 0x0102
use_debug_libraries = 1
optimize =
- compile_flags = /W3 /Gm /GX /Zi /MDd /GR /Gy
+ compile_flags = /W3 /Gm /EHs /Zi /MDd /GR /Gy
defines = _DEBUG
compile_flags_removed = /Fr /YX
output_dir = .
@@ -61,7 +61,7 @@ Static Release {
type_code = 0x0104
use_debug_libraries = 0
optimize = 1
- compile_flags = /W3 /GX /MD /GR
+ compile_flags = /W3 /EHs /MD /GR
defines = NDEBUG
compile_flags_removed = /YX
output_dir = Static_Release
@@ -79,7 +79,7 @@ Static Debug {
type_code = 0x0104
use_debug_libraries = 1
optimize =
- compile_flags = /W3 /Gm /GX /Zi /GR /Gy /MDd
+ compile_flags = /W3 /Gm /EHs /Zi /GR /Gy /MDd
defines = _DEBUG
compile_flags_removed = /Fr /YX
output_dir = Static_Debug
@@ -96,7 +96,7 @@ MFC Release {
type_code = 0x0102
use_debug_libraries = 0
optimize = 1
- compile_flags = /W3 /GX /MD /GR
+ compile_flags = /W3 /EHs /MD /GR
defines = NDEBUG
compile_flags_removed = /YX
output_dir = MFC_Release
@@ -113,7 +113,7 @@ MFC Debug {
type_code = 0x0102
use_debug_libraries = 1
optimize =
- compile_flags = /W3 /Gm /GX /Zi /MDd /GR /Gy
+ compile_flags = /W3 /Gm /EHs /Zi /MDd /GR /Gy
defines = _DEBUG
compile_flags_removed = /Fr /YX
output_dir = MFC_Debug
@@ -132,7 +132,7 @@ Static MFC Release {
type_code = 0x0104
use_debug_libraries = 0
optimize = 1
- compile_flags = /W3 /GX /MD /GR
+ compile_flags = /W3 /EHs /MD /GR
defines = NDEBUG
compile_flags_removed = /YX
output_dir = Static_MFC_Release
@@ -150,7 +150,7 @@ Static MFC Debug {
type_code = 0x0104
use_debug_libraries = 1
optimize =
- compile_flags = /W3 /Gm /GX /Zi /GR /Gy /MDd
+ compile_flags = /W3 /Gm /EHs /Zi /GR /Gy /MDd
defines = _DEBUG
compile_flags_removed = /Fr /YX
output_dir = Static_MFC_Debug
diff --git a/templates/nmakeexe.mpt b/templates/nmakeexe.mpt
index 3e4dde0d..1bb60057 100644
--- a/templates/nmakeexe.mpt
+++ b/templates/nmakeexe.mpt
@@ -28,7 +28,7 @@ Win64 {
Release {
use_debug_libraries = 0
optimize = 1
- compile_flags = /W3 /GX /MD /GR
+ compile_flags = /W3 /EHs /MD /GR
defines = NDEBUG
compile_flags_removed = /YX
output_dir = Release
@@ -40,7 +40,7 @@ Release {
Debug {
use_debug_libraries = 1
optimize =
- compile_flags = /W3 /Gm /GX /Zi /MDd /GR /Gy
+ compile_flags = /W3 /Gm /EHs /Zi /MDd /GR /Gy
defines = _DEBUG
compile_flags_removed = /YX
output_dir = .
@@ -54,7 +54,7 @@ Debug {
Static Release {
use_debug_libraries = 0
optimize = 1
- compile_flags = /W3 /GX /MD /GR
+ compile_flags = /W3 /EHs /MD /GR
defines = NDEBUG
compile_flags_removed = /YX
lib_modifier = s
@@ -67,7 +67,7 @@ Static Release {
Static Debug {
use_debug_libraries = 1
optimize =
- compile_flags = /W3 /Gm /GX /Zi /MDd /GR /Gy
+ compile_flags = /W3 /Gm /EHs /Zi /MDd /GR /Gy
defines = _DEBUG
compile_flags_removed = /YX
lib_modifier = sd
@@ -82,7 +82,7 @@ MFC Release {
subsystem = windows
use_debug_libraries = 0
optimize = 1
- compile_flags = /W3 /GX /MD /GR
+ compile_flags = /W3 /EHs /MD /GR
defines = NDEBUG _AFXDLL
compile_flags_removed = /YX
output_dir = MFC_Release
@@ -97,7 +97,7 @@ MFC Debug {
subsystem = windows
use_debug_libraries = 1
optimize =
- compile_flags = /W3 /Gm /GX /Zi /MDd /GR /Gy
+ compile_flags = /W3 /Gm /EHs /Zi /MDd /GR /Gy
defines = _DEBUG _AFXDLL
compile_flags_removed = /YX
output_dir = MFC_Debug
@@ -113,7 +113,7 @@ Static MFC Release {
subsystem = windows
use_debug_libraries = 0
optimize = 1
- compile_flags = /W3 /GX /MD /GR
+ compile_flags = /W3 /EHs /MD /GR
defines = NDEBUG _AFXDLL
compile_flags_removed = /YX
lib_modifier = mfcs
@@ -128,7 +128,7 @@ Static MFC Debug {
subsystem = windows
use_debug_libraries = 1
optimize =
- compile_flags = /W3 /Gm /GX /Zi /MDd /GR /Gy
+ compile_flags = /W3 /Gm /EHs /Zi /MDd /GR /Gy
defines = _DEBUG _AFXDLL
compile_flags_removed = /YX
lib_modifier = mfcsd
diff --git a/templates/vc8.mpd b/templates/vc8.mpd
index 7ac0f99a..795a6096 100644
--- a/templates/vc8.mpd
+++ b/templates/vc8.mpd
@@ -33,7 +33,7 @@
<%if(UseOfMFC)%>
UseOfMFC="<%UseOfMFC%>"
<%endif%>
- CharacterSet="<%charset("1")%>"
+ CharacterSet="<%charset("0")%>"
>
<Tool
Name="VCPreBuildEventTool"