Several optimizations

* BUSMASTER.exe.manifest: File beautified * stdafx.h: WINVER declarations removed * CMakeLists.txt: Unnecessary linker declarations removed (e.g. /STACK:8000000) * CMakeLists.txt: Unnecessary optimization hinderers removed (e.g. remove_definitions) Signed-off-by: Tobias Lorenz <[email protected]>
Hongjie-Ma · Aug 29, 2014 · 569daa4 · 569daa4
1 parent 2dc1ca1
commit 569daa4
Show file tree

Hide file tree

Showing 48 changed files with 84 additions and 283 deletions.
diff --git a/Sources/Application/BUSMASTER.exe.manifest b/Sources/Application/BUSMASTER.exe.manifest
@@ -1,2 +1,46 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"><assemblyIdentity name="DMGraph" version="5.0.0.1" type="win32"/><dependency><dependentAssembly><assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.21022.8" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity></dependentAssembly></dependency><file name="DMGraph.dll" hashalg="SHA1"><comClass progid="DMGraph.DMGraphCtrl" clsid="{AAF89A51-7FC0-43B0-9F81-FFEFF6A8DB43}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="DMGraphCtrl Class"></comClass><comClass clsid="{14A14BAD-2949-4186-9529-BBB2CC7F9699}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="ElementPropPage Class"></comClass><comClass clsid="{273DB50A-E76D-4B95-8E1A-0993E14FFEF0}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="AnnoPropPage Class"></comClass><comClass clsid="{5DF8A597-C334-4ED5-8D45-8884D506044D}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="CursorPropPage Class"></comClass><comClass clsid="{9EE3E072-2B3F-47AB-8612-B6ED7F0CDAE6}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="FormatPropPage Class"></comClass><comClass clsid="{CB32B59D-7AAA-44B5-ACDF-A64B9380E48C}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="DMGraphPropPage Class"></comClass><typelib tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" version="1.0" helpdir="" flags="HASDISKIMAGE"></typelib></file><trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"><security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel></requestedPrivileges></security></trustInfo><comInterfaceExternalProxyStub name="IDMGraphElement" iid="{4CA52AB5-B6CE-41AF-9A09-284D00714F8E}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub><comInterfaceExternalProxyStub name="IDMGraphAnnotation" iid="{7D965DBB-74CD-42D2-A9C6-53ED80188B35}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub><comInterfaceExternalProxyStub name="IDMGraphCursor" iid="{FB9B14B4-6ACC-4BDA-94A4-B75A3C349623}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub><comInterfaceExternalProxyStub name="IDMGraphAxis" iid="{C735264E-70BB-48BB-AC9C-93188A12C254}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub><comInterfaceExternalProxyStub name="IDMGraphCollection" iid="{022E739F-00BB-40BE-BBBA-8492E4443493}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub><comInterfaceExternalProxyStub name="IDMGraphCtrl" iid="{2DC9C043-D85A-45B3-8867-9E3D035DEC7F}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub></assembly>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity name="DMGraph" version="5.0.0.1" type="win32"/>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.21022.8" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b">
+      </assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+  <file name="DMGraph.dll" hashalg="SHA1">
+    <comClass progid="DMGraph.DMGraphCtrl" clsid="{AAF89A51-7FC0-43B0-9F81-FFEFF6A8DB43}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="DMGraphCtrl Class">
+    </comClass>
+    <comClass clsid="{14A14BAD-2949-4186-9529-BBB2CC7F9699}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="ElementPropPage Class">
+    </comClass>
+    <comClass clsid="{273DB50A-E76D-4B95-8E1A-0993E14FFEF0}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="AnnoPropPage Class">
+    </comClass>
+    <comClass clsid="{5DF8A597-C334-4ED5-8D45-8884D506044D}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="CursorPropPage Class">
+    </comClass>
+    <comClass clsid="{9EE3E072-2B3F-47AB-8612-B6ED7F0CDAE6}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="FormatPropPage Class">
+    </comClass>
+    <comClass clsid="{CB32B59D-7AAA-44B5-ACDF-A64B9380E48C}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" description="DMGraphPropPage Class">
+    </comClass>
+    <typelib tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" version="1.0" helpdir="" flags="HASDISKIMAGE">
+    </typelib>
+  </file>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false">
+        </requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <comInterfaceExternalProxyStub name="IDMGraphElement" iid="{4CA52AB5-B6CE-41AF-9A09-284D00714F8E}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}">
+  </comInterfaceExternalProxyStub>
+  <comInterfaceExternalProxyStub name="IDMGraphAnnotation" iid="{7D965DBB-74CD-42D2-A9C6-53ED80188B35}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}">
+  </comInterfaceExternalProxyStub>
+  <comInterfaceExternalProxyStub name="IDMGraphCursor" iid="{FB9B14B4-6ACC-4BDA-94A4-B75A3C349623}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}">
+  </comInterfaceExternalProxyStub>
+  <comInterfaceExternalProxyStub name="IDMGraphAxis" iid="{C735264E-70BB-48BB-AC9C-93188A12C254}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}">
+  </comInterfaceExternalProxyStub>
+  <comInterfaceExternalProxyStub name="IDMGraphCollection" iid="{022E739F-00BB-40BE-BBBA-8492E4443493}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}">
+  </comInterfaceExternalProxyStub>
+  <comInterfaceExternalProxyStub name="IDMGraphCtrl" iid="{2DC9C043-D85A-45B3-8867-9E3D035DEC7F}" tlbid="{A5E18713-3023-4FD2-8DCB-E82B6F330F48}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}">
+  </comInterfaceExternalProxyStub>
+</assembly>
diff --git a/Sources/Application/CMakeLists.txt b/Sources/Application/CMakeLists.txt
@@ -214,11 +214,10 @@ add_dependencies(BUSMASTER
   BusEmulation)
 
 # compiler options
-add_definitions(-Gy -Od -GF)
-remove_definitions(-G2 -O2 -Ob2 -GR)
+add_definitions(-Od -GF)
 
 # linker options
-set_target_properties(BUSMASTER PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000 /NXCOMPAT:NO")
+set_target_properties(BUSMASTER PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(BUSMASTER
   Winmm shlwapi htmlhelp psapi
   CommonClass

diff --git a/Sources/BusEmulation/CMakeLists.txt b/Sources/BusEmulation/CMakeLists.txt
@@ -35,7 +35,7 @@ include_directories(
 set(CMAKE_MFC_FLAG 0)
 
 # linker options
-set_target_properties(BusEmulation PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(BusEmulation PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(BusEmulation
   RpcRT4
   comctl32

diff --git a/Sources/BusEmulation/stdafx_BusSim.h b/Sources/BusEmulation/stdafx_BusSim.h
@@ -28,24 +28,6 @@
 #define STRICT
 #endif
 
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER              // Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0400       // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
-#endif
-
-#ifndef _WIN32_WINNT        // Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 2000 or later.
-#endif
-
-//#ifndef _WIN32_WINDOWS        // Allow use of features specific to Windows 98 or later.
-//#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-//#endif
-
-#ifndef _WIN32_IE           // Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400    // Change this to the appropriate value to target IE 5.0 or later.
-#endif
-
 #define _ATL_APARTMENT_THREADED
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 
@@ -62,5 +44,3 @@ using namespace ATL;
 
 #include <map>
 #include <time.h>
-
-//#pragma pack(8)
diff --git a/Sources/CAN_ETAS_BOA/CAN_ETAS_BOA_stdafx.h b/Sources/CAN_ETAS_BOA/CAN_ETAS_BOA_stdafx.h
@@ -31,24 +31,6 @@
 #define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
 #endif
 
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER              // Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0400       // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
-#endif
-
-#ifndef _WIN32_WINNT        // Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 2000 or later.
-#endif
-
-//#ifndef _WIN32_WINDOWS        // Allow use of features specific to Windows 98 or later.
-//#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-//#endif
-
-#ifndef _WIN32_IE           // Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400    // Change this to the appropriate value to target IE 5.0 or later.
-#endif
-
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS  // some CString constructors will be explicit
 
 #include <afxwin.h>         // MFC core and standard components

diff --git a/Sources/CAN_ETAS_BOA/CMakeLists.txt b/Sources/CAN_ETAS_BOA/CMakeLists.txt
@@ -35,9 +35,9 @@ target_compile_definitions(CAN_ETAS_BOA_1_5 PUBLIC -DBOA_VERSION=BOA_VERSION_1_5
 target_compile_definitions(CAN_ETAS_BOA_2   PUBLIC -DBOA_VERSION=BOA_VERSION_2)
 
 # linker options
-set_target_properties(CAN_ETAS_BOA_1_4 PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
-set_target_properties(CAN_ETAS_BOA_1_5 PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
-set_target_properties(CAN_ETAS_BOA_2 PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(CAN_ETAS_BOA_1_4 PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
+set_target_properties(CAN_ETAS_BOA_1_5 PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
+set_target_properties(CAN_ETAS_BOA_2   PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(CAN_ETAS_BOA_1_4
   Advapi32
   DataTypes

diff --git a/Sources/CAN_ICS_neoVI/CMakeLists.txt b/Sources/CAN_ICS_neoVI/CMakeLists.txt
@@ -37,7 +37,7 @@ include_directories(
 add_definitions(-D_USRDLL)
 
 # linker options
-set_target_properties(CAN_ICS_neoVI PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(CAN_ICS_neoVI PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(CAN_ICS_neoVI
   DataTypes
   Utils)

diff --git a/Sources/CAN_ISOLAR_EVE_VCAN/CAN_ISOLAR_EVE_VCAN_stdafx.h b/Sources/CAN_ISOLAR_EVE_VCAN/CAN_ISOLAR_EVE_VCAN_stdafx.h
@@ -31,24 +31,6 @@
 #define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
 #endif
 
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER              // Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0400       // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
-#endif
-
-#ifndef _WIN32_WINNT        // Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 2000 or later.
-#endif
-
-//#ifndef _WIN32_WINDOWS        // Allow use of features specific to Windows 98 or later.
-//#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-//#endif
-
-#ifndef _WIN32_IE           // Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400    // Change this to the appropriate value to target IE 5.0 or later.
-#endif
-
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS  // some CString constructors will be explicit
 
 #include <afxwin.h>         // MFC core and standard components

diff --git a/Sources/CAN_ISOLAR_EVE_VCAN/CMakeLists.txt b/Sources/CAN_ISOLAR_EVE_VCAN/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(
 add_definitions(-D_USRDLL)
 
 # linker options
-set_target_properties(CAN_ISOLAR_EVE_VCAN PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(CAN_ISOLAR_EVE_VCAN PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(CAN_ISOLAR_EVE_VCAN
   Advapi32
   DataTypes

diff --git a/Sources/CAN_IXXAT_VCI/CMakeLists.txt b/Sources/CAN_IXXAT_VCI/CMakeLists.txt
@@ -46,7 +46,7 @@ include_directories(
 add_definitions(-D_USRDLL)
 
 # linker options
-set_target_properties(CAN_IXXAT_VCI PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(CAN_IXXAT_VCI PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(CAN_IXXAT_VCI
   Utils)
 

diff --git a/Sources/CAN_Kvaser_CAN/CMakeLists.txt b/Sources/CAN_Kvaser_CAN/CMakeLists.txt
@@ -34,7 +34,7 @@ include_directories(
 add_definitions(-D_USRDLL)
 
 # linker options
-set_target_properties(CAN_Kvaser_CAN PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(CAN_Kvaser_CAN PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(CAN_Kvaser_CAN
   ${CMAKE_CURRENT_SOURCE_DIR}/EXTERNAL/Lib/MS/canlib32.lib
   CommonClass

diff --git a/Sources/CAN_MHS/CAN_MHS_stdafx.h b/Sources/CAN_MHS/CAN_MHS_stdafx.h
@@ -28,20 +28,6 @@
 #define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
 #endif
 
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER              // Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0400       // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
-#endif
-
-#ifndef _WIN32_WINNT        // Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 2000 or later.
-#endif
-
-#ifndef _WIN32_IE           // Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400    // Change this to the appropriate value to target IE 5.0 or later.
-#endif
-
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS  // some CString constructors will be explicit
 
 #include <afxwin.h>         // MFC core and standard components

diff --git a/Sources/CAN_MHS/CMakeLists.txt b/Sources/CAN_MHS/CMakeLists.txt
@@ -27,7 +27,7 @@ include_directories(
 add_definitions(-D_USRDLL)
 
 # linker options
-set_target_properties(CAN_MHS PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(CAN_MHS PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(CAN_MHS
   ${CMAKE_CURRENT_SOURCE_DIR}/EXTERNAL/mhstcan.lib
   ${CMAKE_CURRENT_SOURCE_DIR}/EXTERNAL/mhsbmcfg.lib

diff --git a/Sources/CAN_NSI/CMakeLists.txt b/Sources/CAN_NSI/CMakeLists.txt
@@ -34,7 +34,7 @@ include_directories(
 add_definitions(-D_USRDLL)
 
 # linker options
-set_target_properties(CAN_NSI PROPERTIES LINK_FLAGS "/STACK:8000000 /SAFESEH:NO")
+set_target_properties(CAN_NSI PROPERTIES LINK_FLAGS "/SAFESEH:NO")
 target_link_libraries(CAN_NSI
   ${CMAKE_CURRENT_SOURCE_DIR}/NSICANEX.lib
   DataTypes

diff --git a/Sources/CAN_STUB/CMakeLists.txt b/Sources/CAN_STUB/CMakeLists.txt
@@ -23,7 +23,7 @@ add_dependencies(CAN_STUB
 add_definitions(-D_USRDLL)
 
 # linker options
-set_target_properties(CAN_STUB PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(CAN_STUB PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(CAN_STUB
   DataTypes
   Utils)

diff --git a/Sources/CAN_VSCOM/CAN_VSCOM_stdafx.h b/Sources/CAN_VSCOM/CAN_VSCOM_stdafx.h
@@ -28,20 +28,6 @@
 #define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
 #endif
 
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER              // Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0400       // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
-#endif
-
-#ifndef _WIN32_WINNT        // Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 2000 or later.
-#endif
-
-#ifndef _WIN32_IE           // Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400    // Change this to the appropriate value to target IE 5.0 or later.
-#endif
-
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS  // some CString constructors will be explicit
 
 #include <afxwin.h>         // MFC core and standard components

diff --git a/Sources/CAN_VSCOM/CMakeLists.txt b/Sources/CAN_VSCOM/CMakeLists.txt
@@ -26,7 +26,7 @@ include_directories(
 add_definitions(-D_USRDLL)
 
 # linker options
-set_target_properties(CAN_VSCOM PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(CAN_VSCOM PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(CAN_VSCOM
   ${CMAKE_CURRENT_SOURCE_DIR}/EXTERNAL/vs_can_api.lib
   DataTypes

diff --git a/Sources/CAN_Vector_XL/CAN_Vector_XL_stdafx.h b/Sources/CAN_Vector_XL/CAN_Vector_XL_stdafx.h
@@ -31,24 +31,6 @@
 #define VC_EXTRALEAN        // Exclude rarely-used stuff from Windows headers
 #endif
 
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER              // Allow use of features specific to Windows 95 and Windows NT 4 or later.
-#define WINVER 0x0400       // Change this to the appropriate value to target Windows 98 and Windows 2000 or later.
-#endif
-
-#ifndef _WIN32_WINNT        // Allow use of features specific to Windows NT 4 or later.
-#define _WIN32_WINNT 0x0400 // Change this to the appropriate value to target Windows 2000 or later.
-#endif
-
-//#ifndef _WIN32_WINDOWS        // Allow use of features specific to Windows 98 or later.
-//#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-//#endif
-
-#ifndef _WIN32_IE           // Allow use of features specific to IE 4.0 or later.
-#define _WIN32_IE 0x0400    // Change this to the appropriate value to target IE 5.0 or later.
-#endif
-
 #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS  // some CString constructors will be explicit
 
 #include <afxwin.h>         // MFC core and standard components

diff --git a/Sources/CAN_Vector_XL/CMakeLists.txt b/Sources/CAN_Vector_XL/CMakeLists.txt
@@ -34,7 +34,7 @@ include_directories(
 add_definitions(-D_USRDLL)
 
 # linker options
-set_target_properties(CAN_Vector_XL PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(CAN_Vector_XL PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(CAN_Vector_XL
   Advapi32
   DataTypes

diff --git a/Sources/CommonClass/CMakeLists.txt b/Sources/CommonClass/CMakeLists.txt
@@ -27,7 +27,6 @@ include_directories(
 
 # compiler options
 add_definitions(-D_LIB)
-remove_definitions(-GR)
 
 # linker options
 target_link_libraries(CommonClass

diff --git a/Sources/DIL_Interface/CMakeLists.txt b/Sources/DIL_Interface/CMakeLists.txt
@@ -43,10 +43,9 @@ include_directories(
 
 # compiler options
 add_definitions(-D_USRDLL -Od)
-remove_definitions(-O2)
 
 # linker options
-set_target_properties(DIL_Interface PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(DIL_Interface PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(DIL_Interface
   CAN_ICS_neoVI
   CAN_Kvaser_CAN

diff --git a/Sources/DIL_J1939/CMakeLists.txt b/Sources/DIL_J1939/CMakeLists.txt
@@ -33,7 +33,7 @@ include_directories(
 add_definitions(-D_USRDLL)
 
 # linker options
-set_target_properties(DIL_J1939 PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid /STACK:8000000")
+set_target_properties(DIL_J1939 PROPERTIES LINK_FLAGS "/NODEFAULTLIB:daouuid")
 target_link_libraries(DIL_J1939
   Utils
   DataTypes)