Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make TOOLKIT variable constant in MSW makefiles.

Browse Source 
This fixes duplicate lines defining rules for generic files for more than one
port in the makefiles.

Closes #14979.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-06 11:59:35 +00:00
parent cb6223b4a6
commit f901941933
31 changed files with 11546 additions and 89794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/bakefiles/config.bkl
View File

@@ -66,7 +66,8 @@
</option>
</if>
<if cond="FORMAT in ['msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
<!-- We must make TOOLKIT a constant under MSW -->
<if cond="FORMAT in ['borland','mingw','msvc','watcom', 'msvc6prj', 'msvs2003prj', 'msvs2005prj', 'msvs2008prj']">
<set var="TOOLKIT">MSW</set>
</if>
</if>

5
build/msw/config.bcc
View File

@@ -50,11 +50,6 @@ CPP = cpp32 -Sr -oCON
SHARED = 0
!endif
# Used toolkit [MSW,GTK]
!ifndef TOOLKIT
TOOLKIT = MSW
!endif
# GTK+ toolkit version [,2]
!ifndef TOOLKIT_VERSION
TOOLKIT_VERSION =

3
build/msw/config.gcc
View File

@@ -40,9 +40,6 @@ CPP ?= $(CC) -E
# What type of library to build? [0,1]
SHARED ?= 0
# Used toolkit [MSW,GTK]
TOOLKIT ?= MSW
# GTK+ toolkit version [,2]
TOOLKIT_VERSION ?=

3
build/msw/config.vc
View File

@@ -34,9 +34,6 @@ CPP = $(CC) /EP /nologo
# What type of library to build? [0,1]
SHARED = 0
# Used toolkit [MSW,GTK]
TOOLKIT = MSW
# GTK+ toolkit version [,2]
TOOLKIT_VERSION =

4
build/msw/config.wat
View File

@@ -35,10 +35,6 @@ CPP = $(CC) -p
# 1 - DLL
SHARED = 0
# Used toolkit [MSW,GTK]
# GTK - GTK+
TOOLKIT = MSW
# GTK+ toolkit version [,2]
TOOLKIT_VERSION =

20930
build/msw/makefile.bcc
View File

File diff suppressed because it is too large Load Diff

25444
build/msw/makefile.gcc
View File

File diff suppressed because it is too large Load Diff

21497
build/msw/makefile.vc
View File

File diff suppressed because it is too large Load Diff

26002
build/msw/makefile.wat
View File

File diff suppressed because it is too large Load Diff

12
build/msw/wx_adv.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=adv - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=adv - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "adv - Win32 DLL Release"
!IF "$(CFG)" == "adv - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -244,7 +244,7 @@ SOURCE=..\..\src\msw\timectrl.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "adv - Win32 DLL Release"
!IF "$(CFG)" == "adv - Win32 DLL Release"
!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
@@ -377,7 +377,7 @@ SOURCE=..\..\src\generic\wizard.cpp
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "adv - Win32 DLL Release"
!IF "$(CFG)" == "adv - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -424,7 +424,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "adv - Win32 DLL Release"
!IF "$(CFG)" == "adv - Win32 DLL Release"
# Begin Custom Build -
@@ -479,7 +479,7 @@ SOURCE=..\..\include\wx\msw\datetimectrl.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "adv - Win32 DLL Release"
!IF "$(CFG)" == "adv - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

12
build/msw/wx_aui.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=aui - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=aui - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "aui - Win32 DLL Release"
!IF "$(CFG)" == "aui - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -152,7 +152,7 @@ SOURCE=..\..\src\common\dummy.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "aui - Win32 DLL Release"
!IF "$(CFG)" == "aui - Win32 DLL Release"
!ELSEIF "$(CFG)" == "aui - Win32 DLL Debug"
@@ -177,7 +177,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "aui - Win32 DLL Release"
!IF "$(CFG)" == "aui - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -224,7 +224,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "aui - Win32 DLL Release"
!IF "$(CFG)" == "aui - Win32 DLL Release"
# Begin Custom Build -
@@ -259,7 +259,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "aui - Win32 DLL Release"
!IF "$(CFG)" == "aui - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

12
build/msw/wx_base.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=base - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=base - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "base - Win32 DLL Release"
!IF "$(CFG)" == "base - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -593,7 +593,7 @@ SOURCE=..\..\src\msw\utilsexc.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "base - Win32 DLL Release"
!IF "$(CFG)" == "base - Win32 DLL Release"
!ELSEIF "$(CFG)" == "base - Win32 DLL Debug"
@@ -630,7 +630,7 @@ SOURCE=..\..\src\generic\fswatcherg.cpp
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "base - Win32 DLL Release"
!IF "$(CFG)" == "base - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -677,7 +677,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "base - Win32 DLL Release"
!IF "$(CFG)" == "base - Win32 DLL Release"
# Begin Custom Build -
@@ -748,7 +748,7 @@ SOURCE=..\..\include\wx\msw\gccpriv.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "base - Win32 DLL Release"
!IF "$(CFG)" == "base - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

7231
build/msw/wx_core.dsp
View File

File diff suppressed because it is too large Load Diff

12
build/msw/wx_gl.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=gl - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=gl - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "gl - Win32 DLL Release"
!IF "$(CFG)" == "gl - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -160,7 +160,7 @@ SOURCE=..\..\src\msw\glcanvas.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "gl - Win32 DLL Release"
!IF "$(CFG)" == "gl - Win32 DLL Release"
!ELSEIF "$(CFG)" == "gl - Win32 DLL Debug"
@@ -185,7 +185,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "gl - Win32 DLL Release"
!IF "$(CFG)" == "gl - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -232,7 +232,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "gl - Win32 DLL Release"
!IF "$(CFG)" == "gl - Win32 DLL Release"
# Begin Custom Build -
@@ -267,7 +267,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "gl - Win32 DLL Release"
!IF "$(CFG)" == "gl - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

12
build/msw/wx_html.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=html - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=html - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "html - Win32 DLL Release"
!IF "$(CFG)" == "html - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -156,7 +156,7 @@ SOURCE=..\..\src\msw\helpbest.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "html - Win32 DLL Release"
!IF "$(CFG)" == "html - Win32 DLL Release"
!ELSEIF "$(CFG)" == "html - Win32 DLL Debug"
@@ -289,7 +289,7 @@ SOURCE=..\..\src\html\winpars.cpp
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "html - Win32 DLL Release"
!IF "$(CFG)" == "html - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -336,7 +336,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "html - Win32 DLL Release"
!IF "$(CFG)" == "html - Win32 DLL Release"
# Begin Custom Build -
@@ -371,7 +371,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "html - Win32 DLL Release"
!IF "$(CFG)" == "html - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

12
build/msw/wx_media.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=media - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=media - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "media - Win32 DLL Release"
!IF "$(CFG)" == "media - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -168,7 +168,7 @@ SOURCE=..\..\src\msw\mediactrl_wmp10.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "media - Win32 DLL Release"
!IF "$(CFG)" == "media - Win32 DLL Release"
!ELSEIF "$(CFG)" == "media - Win32 DLL Debug"
@@ -193,7 +193,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "media - Win32 DLL Release"
!IF "$(CFG)" == "media - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -240,7 +240,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "media - Win32 DLL Release"
!IF "$(CFG)" == "media - Win32 DLL Release"
# Begin Custom Build -
@@ -275,7 +275,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "media - Win32 DLL Release"
!IF "$(CFG)" == "media - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

12
build/msw/wx_net.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=net - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=net - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "net - Win32 DLL Release"
!IF "$(CFG)" == "net - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -200,7 +200,7 @@ SOURCE=..\..\src\msw\urlmsw.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "net - Win32 DLL Release"
!IF "$(CFG)" == "net - Win32 DLL Release"
!ELSEIF "$(CFG)" == "net - Win32 DLL Debug"
@@ -225,7 +225,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "net - Win32 DLL Release"
!IF "$(CFG)" == "net - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -272,7 +272,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "net - Win32 DLL Release"
!IF "$(CFG)" == "net - Win32 DLL Release"
# Begin Custom Build -
@@ -307,7 +307,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "net - Win32 DLL Release"
!IF "$(CFG)" == "net - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

12
build/msw/wx_propgrid.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=propgrid - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=propgrid - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "propgrid - Win32 DLL Release"
!IF "$(CFG)" == "propgrid - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -152,7 +152,7 @@ SOURCE=..\..\src\common\dummy.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "propgrid - Win32 DLL Release"
!IF "$(CFG)" == "propgrid - Win32 DLL Release"
!ELSEIF "$(CFG)" == "propgrid - Win32 DLL Debug"
@@ -177,7 +177,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "propgrid - Win32 DLL Release"
!IF "$(CFG)" == "propgrid - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -224,7 +224,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "propgrid - Win32 DLL Release"
!IF "$(CFG)" == "propgrid - Win32 DLL Release"
# Begin Custom Build -
@@ -259,7 +259,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "propgrid - Win32 DLL Release"
!IF "$(CFG)" == "propgrid - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

12
build/msw/wx_qa.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=qa - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=qa - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "qa - Win32 DLL Release"
!IF "$(CFG)" == "qa - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -156,7 +156,7 @@ SOURCE=..\..\src\common\dummy.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "qa - Win32 DLL Release"
!IF "$(CFG)" == "qa - Win32 DLL Release"
!ELSEIF "$(CFG)" == "qa - Win32 DLL Debug"
@@ -189,7 +189,7 @@ SOURCE=..\..\src\generic\dbgrptg.cpp
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "qa - Win32 DLL Release"
!IF "$(CFG)" == "qa - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -236,7 +236,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "qa - Win32 DLL Release"
!IF "$(CFG)" == "qa - Win32 DLL Release"
# Begin Custom Build -
@@ -271,7 +271,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "qa - Win32 DLL Release"
!IF "$(CFG)" == "qa - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

12
build/msw/wx_richtext.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=richtext - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=richtext - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "richtext - Win32 DLL Release"
!IF "$(CFG)" == "richtext - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -152,7 +152,7 @@ SOURCE=..\..\src\common\dummy.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "richtext - Win32 DLL Release"
!IF "$(CFG)" == "richtext - Win32 DLL Release"
!ELSEIF "$(CFG)" == "richtext - Win32 DLL Debug"
@@ -177,7 +177,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "richtext - Win32 DLL Release"
!IF "$(CFG)" == "richtext - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -224,7 +224,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "richtext - Win32 DLL Release"
!IF "$(CFG)" == "richtext - Win32 DLL Release"
# Begin Custom Build -
@@ -259,7 +259,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "richtext - Win32 DLL Release"
!IF "$(CFG)" == "richtext - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

12
build/msw/wx_stc.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=stc - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=stc - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "stc - Win32 DLL Release"
!IF "$(CFG)" == "stc - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -152,7 +152,7 @@ SOURCE=..\..\src\common\dummy.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "stc - Win32 DLL Release"
!IF "$(CFG)" == "stc - Win32 DLL Release"
!ELSEIF "$(CFG)" == "stc - Win32 DLL Debug"
@@ -177,7 +177,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "stc - Win32 DLL Release"
!IF "$(CFG)" == "stc - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -224,7 +224,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "stc - Win32 DLL Release"
!IF "$(CFG)" == "stc - Win32 DLL Release"
# Begin Custom Build -
@@ -259,7 +259,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "stc - Win32 DLL Release"
!IF "$(CFG)" == "stc - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

12
build/msw/wx_webview.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=webview - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=webview - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "webview - Win32 DLL Release"
!IF "$(CFG)" == "webview - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -164,7 +164,7 @@ SOURCE=..\..\src\common\webviewfshandler.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "webview - Win32 DLL Release"
!IF "$(CFG)" == "webview - Win32 DLL Release"
!ELSEIF "$(CFG)" == "webview - Win32 DLL Debug"
@@ -193,7 +193,7 @@ SOURCE=..\..\src\msw\webview_ie.cpp
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "webview - Win32 DLL Release"
!IF "$(CFG)" == "webview - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -240,7 +240,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "webview - Win32 DLL Release"
!IF "$(CFG)" == "webview - Win32 DLL Release"
# Begin Custom Build -
@@ -275,7 +275,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "webview - Win32 DLL Release"
!IF "$(CFG)" == "webview - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

2
build/msw/wx_wxexpat.dsp
View File

@@ -30,7 +30,7 @@ CFG=wxexpat - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxexpat - Win32 DLL Release"
!IF "$(CFG)" == "wxexpat - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1

2
build/msw/wx_wxjpeg.dsp
View File

@@ -30,7 +30,7 @@ CFG=wxjpeg - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxjpeg - Win32 DLL Release"
!IF "$(CFG)" == "wxjpeg - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1

2
build/msw/wx_wxpng.dsp
View File

@@ -30,7 +30,7 @@ CFG=wxpng - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxpng - Win32 DLL Release"
!IF "$(CFG)" == "wxpng - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1

8
build/msw/wx_wxregex.dsp
View File

@@ -30,7 +30,7 @@ CFG=wxregex - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxregex - Win32 DLL Release"
!IF "$(CFG)" == "wxregex - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -157,7 +157,7 @@ SOURCE=..\..\src\regex\regfree.c
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "wxregex - Win32 DLL Release"
!IF "$(CFG)" == "wxregex - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h
@@ -204,7 +204,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "wxregex - Win32 DLL Release"
!IF "$(CFG)" == "wxregex - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -251,7 +251,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "wxregex - Win32 DLL Release"
!IF "$(CFG)" == "wxregex - Win32 DLL Release"
# Begin Custom Build -

8
build/msw/wx_wxscintilla.dsp
View File

@@ -30,7 +30,7 @@ CFG=wxscintilla - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxscintilla - Win32 DLL Release"
!IF "$(CFG)" == "wxscintilla - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -617,7 +617,7 @@ SOURCE=..\..\src\stc\scintilla\src\XPM.cxx
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "wxscintilla - Win32 DLL Release"
!IF "$(CFG)" == "wxscintilla - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h
@@ -664,7 +664,7 @@ InputPath=..\..\include\wx\msw\genrcdefs.h
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "wxscintilla - Win32 DLL Release"
!IF "$(CFG)" == "wxscintilla - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -711,7 +711,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "wxscintilla - Win32 DLL Release"
!IF "$(CFG)" == "wxscintilla - Win32 DLL Release"
# Begin Custom Build -

26
build/msw/wx_wxtiff.dsp
View File

@@ -30,7 +30,7 @@ CFG=wxtiff - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxtiff - Win32 DLL Release"
!IF "$(CFG)" == "wxtiff - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -199,26 +199,26 @@ SOURCE=..\..\src\tiff\libtiff\tif_getimage.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\libtiff\tif_jbig.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\libtiff\tif_jbig.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\libtiff\tif_jpeg.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\libtiff\tif_jpeg_12.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\libtiff\tif_jpeg_12.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\libtiff\tif_luv.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\libtiff\tif_lzma.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\libtiff\tif_lzma.c
# End Source File
# Begin Source File
SOURCE=..\..\src\tiff\libtiff\tif_lzw.c
# End Source File
# Begin Source File

2
build/msw/wx_wxzlib.dsp
View File

@@ -30,7 +30,7 @@ CFG=wxzlib - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "wxzlib - Win32 DLL Release"
!IF "$(CFG)" == "wxzlib - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1

12
build/msw/wx_xml.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=xml - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=xml - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "xml - Win32 DLL Release"
!IF "$(CFG)" == "xml - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -156,7 +156,7 @@ SOURCE=..\..\src\common\xtixml.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "xml - Win32 DLL Release"
!IF "$(CFG)" == "xml - Win32 DLL Release"
!ELSEIF "$(CFG)" == "xml - Win32 DLL Debug"
@@ -181,7 +181,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "xml - Win32 DLL Release"
!IF "$(CFG)" == "xml - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -228,7 +228,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "xml - Win32 DLL Release"
!IF "$(CFG)" == "xml - Win32 DLL Release"
# Begin Custom Build -
@@ -263,7 +263,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "xml - Win32 DLL Release"
!IF "$(CFG)" == "xml - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h

12
build/msw/wx_xrc.dsp
View File

@@ -3,7 +3,7 @@
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=xrc - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
@@ -31,7 +31,7 @@ CFG=xrc - Win32 Debug
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "xrc - Win32 DLL Release"
!IF "$(CFG)" == "xrc - Win32 DLL Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -152,7 +152,7 @@ SOURCE=..\..\src\common\dummy.cpp
SOURCE=..\..\src\msw\version.rc
!IF "$(CFG)" == "xrc - Win32 DLL Release"
!IF "$(CFG)" == "xrc - Win32 DLL Release"
!ELSEIF "$(CFG)" == "xrc - Win32 DLL Debug"
@@ -177,7 +177,7 @@ SOURCE=..\..\src\msw\version.rc
SOURCE=..\..\include\wx\msw\setup.h
!IF "$(CFG)" == "xrc - Win32 DLL Release"
!IF "$(CFG)" == "xrc - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
InputPath=..\..\include\wx\msw\setup.h
@@ -224,7 +224,7 @@ InputPath=..\..\include\wx\msw\setup.h
SOURCE=..\..\include\wx\univ\setup.h
!IF "$(CFG)" == "xrc - Win32 DLL Release"
!IF "$(CFG)" == "xrc - Win32 DLL Release"
# Begin Custom Build -
@@ -259,7 +259,7 @@ SOURCE=..\..\include\wx\univ\setup.h
SOURCE=..\..\include\wx\msw\genrcdefs.h
!IF "$(CFG)" == "xrc - Win32 DLL Release"
!IF "$(CFG)" == "xrc - Win32 DLL Release"
# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
InputPath=..\..\include\wx\msw\genrcdefs.h