Accueil Explorer Aide
S'inscrire Connexion
Apq
/
CMake
miroir de https://github.com/Kitware/CMake.git
1
0
Fork 0
Fichiers Tickets 0 Wiki
Parcourir la source

ENH: allow UNICODE to be specifed in the cxx flags and if not default to MBCS

Bill Hoffman il y a 22 ans
Parent
073a5b69b7
commit
4d2ca08bc7
5 fichiers modifiés avec 37 ajouts et 31 suppressions
Vue unifiée Afficher les stats Diff
  1. 6 0
      Source/cmLocalVisualStudio6Generator.cxx
  2. 7 7
      Templates/DLLHeader.dsptemplate
  3. 8 8
      Templates/EXEHeader.dsptemplate
  4. 8 8
      Templates/EXEWinHeader.dsptemplate
  5. 8 8
      Templates/staticLibHeader.dsptemplate

+ 6 - 0
Source/cmLocalVisualStudio6Generator.cxx
Voir le fichier 

@@ -1005,6 +1005,12 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha
 
       flags = " ";
 
       flags = " ";
 
       flags = m_Makefile->GetDefinition("CMAKE_C_FLAGS");
 
       flags = m_Makefile->GetDefinition("CMAKE_C_FLAGS");
 
       }
 
       }
 
+    // if unicode is not found, then add -D_MBCS
 
+    if(flags.find("D_UNICODE") == flags.npos)
 
+      {
 
+      flags += " /D \"_MBCS\"";
 
+      }
 
+    
     // The template files have CXX FLAGS in them, that need to be replaced.
 
     // The template files have CXX FLAGS in them, that need to be replaced.
 
     // There are not separate CXX and C template files, so we use the same
 
     // There are not separate CXX and C template files, so we use the same
 
     // variable names.   The previous code sets up flags* variables to contain
 
     // variable names.   The previous code sets up flags* variables to contain

+ 7 - 7
Templates/DLLHeader.dsptemplate
Voir le fichier 

@@ -57,8 +57,8 @@ RSC=rc.exe
 
 # PROP Intermediate_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c

-# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"  /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c

+# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL"  /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

@@ -89,7 +89,7 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Ignore_Export_Lib 0

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c

 # ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c

-# ADD CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"  /FD /c

+# ADD CPP /nologo /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL"  /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

@@ -120,9 +120,9 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Ignore_Export_Lib 0

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /FD /c

 # SUBTRACT BASE CPP /YX

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"  /FD /c

+# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL"  /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

@@ -152,8 +152,8 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Ignore_Export_Lib 0

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c

-# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"  /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "OUTPUT_LIBNAME_EXPORTS" /FD /c

+# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL"  /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

+ 8 - 8
Templates/EXEHeader.dsptemplate
Voir le fichier 

@@ -56,8 +56,8 @@ RSC=rc.exe
 
 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelease"

 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelease"

 # PROP Intermediate_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /c

-# ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /c

+# ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

@@ -86,8 +86,8 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHDebug"

 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHDebug"

 # PROP Intermediate_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP   /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /GZ /c

-# ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /GZ /c

+# ADD BASE CPP   /D "WIN32" /D "_DEBUG" /D "_CONSOLE"  /FD /GZ /c

+# ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

@@ -117,8 +117,8 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHMinSizeRel"

 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHMinSizeRel"

 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /c

-# ADD CPP /nologo  /D "WIN32" BUILD_INCLUDES EXTRA_DEFINES /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /c

+# ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo  /D "WIN32" BUILD_INCLUDES EXTRA_DEFINES /D "NDEBUG" /D "_CONSOLE"  /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

@@ -147,8 +147,8 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelWithDebInfo"

 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelWithDebInfo"

 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /c

-# ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /D "_MBCS"  /FD /c

+# ADD BASE CPP /nologo  /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_CONSOLE" /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

+ 8 - 8
Templates/EXEWinHeader.dsptemplate
Voir le fichier 

@@ -56,8 +56,8 @@ RSC=rc.exe
 
 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelease"

 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelease"

 # PROP Intermediate_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /c

-# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

@@ -88,8 +88,8 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHDebug"

 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHDebug"

 # PROP Intermediate_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP  /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /c

-# ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /GZ /c

+# ADD BASE CPP  /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo  /D "WIN32"  /D "_DEBUG" /D "_WINDOWS" /FD /GZ /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

@@ -120,8 +120,8 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHMinSizeRel"

 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHMinSizeRel"

 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /c

-# ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo  /D "WIN32"  /D "NDEBUG" /D "_WINDOWS" /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

@@ -150,8 +150,8 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelWithDebInfo"

 # PROP Output_Dir "EXECUTABLE_OUTPUT_PATHRelWithDebInfo"

 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /c

-# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"  /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# ADD CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

+ 8 - 8
Templates/staticLibHeader.dsptemplate
Voir le fichier 

@@ -53,8 +53,8 @@ RSC=rc.exe
 
 # PROP Output_Dir "LIBRARY_OUTPUT_PATHRelease"

 # PROP Output_Dir "LIBRARY_OUTPUT_PATHRelease"

 # PROP Intermediate_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB"  /FD /c

-# ADD CPP /nologo /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB"  /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB"  /FD /c

+# ADD CPP /nologo /D "NDEBUG" /D "WIN32" /D "_LIB"  /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

 # ADD CPP CMAKE_CXX_FLAGS_RELEASE

@@ -81,8 +81,8 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Output_Dir "LIBRARY_OUTPUT_PATHDebug"

 # PROP Output_Dir "LIBRARY_OUTPUT_PATHDebug"

 # PROP Intermediate_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB"  /FD /c

-# ADD CPP /nologo /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB"  /FD /GZ /c

+# ADD BASE CPP /nologo /D "WIN32" /D "_DEBUG" /D "_LIB"  /FD /c

+# ADD CPP /nologo /D "_DEBUG" /D "WIN32" /D "_LIB"  /FD /GZ /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

 # ADD CPP CMAKE_CXX_FLAGS_DEBUG

@@ -109,8 +109,8 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Intermediate_Dir "MinSizeRel"

 # PROP Ignore_Export_Lib 0

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /FD /c

-# ADD CPP /nologo /D "NDEBUG" /D "_MBCS" /D "_ATL_DLL"  /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_ATL_DLL" /FD /c

+# ADD CPP /nologo /D "NDEBUG" /D "_ATL_DLL"  /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

 # ADD CPP CMAKE_CXX_FLAGS_MINSIZEREL

@@ -137,8 +137,8 @@ CMAKE_CUSTOM_RULE_CODE
 
 # PROP Output_Dir "LIBRARY_OUTPUT_PATHRelWithDebInfo"

 # PROP Output_Dir "LIBRARY_OUTPUT_PATHRelWithDebInfo"

 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Intermediate_Dir "RelWithDebInfo"

 # PROP Target_Dir ""

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB"  /FD /c

-# ADD CPP /nologo /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB"  /FD /c

+# ADD BASE CPP /nologo /D "WIN32" /D "NDEBUG" /D "_LIB"  /FD /c

+# ADD CPP /nologo /D "NDEBUG" /D "WIN32" /D "_LIB"  /FD /c

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP BUILD_INCLUDES EXTRA_DEFINES /D "OUTPUT_LIBNAME_EXPORTS"

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO

 # ADD CPP CMAKE_CXX_FLAGS_RELWITHDEBINFO