Fix recreating of wxBitmapComboBox using untyped client data.

[wxWidgets.git] / build / msw / wx_base.dsp

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index 38a4c7a36d4bdc94808ee54da89b6b3842550db6..9f6bac0e6ba2e70ebf6a667f47eea7fcd2ec4487 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -3,7 +3,7 @@
 # ** DO NOT EDIT **\r
 \r
 # TARGTYPE "Win32 (x86) Static Library" 0x0104\r
 # ** DO NOT EDIT **\r
 \r
 # TARGTYPE "Win32 (x86) Static Library" 0x0104\r

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r

 \r
 CFG=base - Win32 Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
 \r
 CFG=base - Win32 Debug\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r


@@ -31,7 +31,7 @@ CFG=base - Win32 Debug
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r
 CPP=cl.exe\r
 RSC=rc.exe\r
 \r

-!IF  "$(CFG)" == "base - Win32 DLL Release"
+!IF  "$(CFG)" == "base - Win32 DLL Release"\r

 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r
 \r
 # PROP BASE Use_MFC 0\r
 # PROP BASE Use_Debug_Libraries 1\r


@@ -593,7 +593,7 @@ SOURCE=..\..\src\msw\utilsexc.cpp
 \r
 SOURCE=..\..\src\msw\version.rc\r
 \r
 \r
 SOURCE=..\..\src\msw\version.rc\r
 \r

-!IF  "$(CFG)" == "base - Win32 DLL Release"
+!IF  "$(CFG)" == "base - Win32 DLL Release"\r

 \r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"\r
 \r
 \r
 !ELSEIF  "$(CFG)" == "base - Win32 DLL Debug"\r


@@ -630,7 +630,7 @@ SOURCE=..\..\src\generic\fswatcherg.cpp
 \r
 SOURCE=..\..\include\wx\msw\setup.h\r
 \r
 \r
 SOURCE=..\..\include\wx\msw\setup.h\r
 \r

-!IF  "$(CFG)" == "base - Win32 DLL Release"
+!IF  "$(CFG)" == "base - Win32 DLL Release"\r

 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h\r
 InputPath=..\..\include\wx\msw\setup.h\r


@@ -677,7 +677,7 @@ InputPath=..\..\include\wx\msw\setup.h
 \r
 SOURCE=..\..\include\wx\univ\setup.h\r
 \r
 \r
 SOURCE=..\..\include\wx\univ\setup.h\r
 \r

-!IF  "$(CFG)" == "base - Win32 DLL Release"
+!IF  "$(CFG)" == "base - Win32 DLL Release"\r

 \r
 # Begin Custom Build - \r
 \r
 \r
 # Begin Custom Build - \r
 \r


@@ -748,7 +748,7 @@ SOURCE=..\..\include\wx\msw\gccpriv.h
 \r
 SOURCE=..\..\include\wx\msw\genrcdefs.h\r
 \r
 \r
 SOURCE=..\..\include\wx\msw\genrcdefs.h\r
 \r

-!IF  "$(CFG)" == "base - Win32 DLL Release"
+!IF  "$(CFG)" == "base - Win32 DLL Release"\r

 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r
 \r
 # Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h\r
 InputPath=..\..\include\wx\msw\genrcdefs.h\r


@@ -937,6 +937,10 @@ SOURCE=..\..\include\wx\cmdline.h
 # End Source File\r
 # Begin Source File\r
 \r
 # End Source File\r
 # Begin Source File\r
 \r

+SOURCE=..\..\include\wx\compiler.h\r
+# End Source File\r
+# Begin Source File\r
+\r

 SOURCE=..\..\include\wx\confbase.h\r
 # End Source File\r
 # Begin Source File\r
 SOURCE=..\..\include\wx\confbase.h\r
 # End Source File\r
 # Begin Source File\r