fixes for the project file generation for the DLL and Unicode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
@@ -37,28 +37,41 @@
|
||||
next if $wxHTML{$file} =~ /\b16\b/;
|
||||
$project{"WXHTMLSRCS"} .= $file . " "
|
||||
}
|
||||
|
||||
$project{"WX_CFLAGS"} = '/D wxUSE_GUI=1 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__"';
|
||||
if ( Config("unicode") ) {
|
||||
$project{"OUTDIR_SUFFIX"} = "Unicode";
|
||||
$project{"WX_CFLAGS"} .= " /D _UNICODE /D UNICODE";
|
||||
$project{"PROJECTNAME"} = "wxWindowsU";
|
||||
}
|
||||
else {
|
||||
$project{"OUTDIR_SUFFIX"} = "";
|
||||
$project{"PROJECTNAME"} = "wxWindows";
|
||||
}
|
||||
|
||||
$project{"MAKEFILE"} = $project{"PROJECTNAME"} . ".mak";
|
||||
#$}
|
||||
# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Project File - #$ Substitute('Name="$$PROJECTNAME" - Package Owner=<4>');
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Static Library" 0x0104
|
||||
|
||||
CFG=wxWindows - Win32 Debug
|
||||
CFG=#$ Substitute('$$PROJECTNAME - Win32 Debug');
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "wxWindows.mak".
|
||||
!MESSAGE NMAKE /f "#$ ExpandGlue('MAKEFILE','','','".');
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
|
||||
!MESSAGE NMAKE /f #$ Substitute('"$$MAKEFILE" CFG="$$PROJECTNAME - Win32 Debug"');
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
|
||||
!MESSAGE #$ Substitute('"$$PROJECTNAME - Win32 Release" (based on "Win32 (x86) Static Library")');
|
||||
!MESSAGE #$ Substitute('"$$PROJECTNAME - Win32 Debug" (based on "Win32 (x86) Static Library")');
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
@@ -68,20 +81,20 @@ CFG=wxWindows - Win32 Debug
|
||||
CPP=cl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "wxWindows - Win32 Release"
|
||||
!IF "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Release"');
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Output_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
|
||||
# PROP BASE Intermediate_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "Release"
|
||||
# PROP Intermediate_Dir "Release"
|
||||
# PROP Output_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
|
||||
# PROP Intermediate_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "NDEBUG" /D wxUSE_GUI=1 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "NDEBUG" /D "_MT" #$ Substitute('$$WX_CFLAGS /Yu"wx/wxprec.h" /FD /c');
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
@@ -91,20 +104,20 @@ LIB32=link.exe -lib
|
||||
# ADD BASE LIB32 /nologo
|
||||
# ADD LIB32 /nologo
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug"
|
||||
!ELSEIF "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Debug"');
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Output_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
|
||||
# PROP BASE Intermediate_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "Debug"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Output_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
|
||||
# PROP Intermediate_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" -D "_MT" /YX /FD /c
|
||||
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /Fr /D "_MT" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /Fr /D "_MT" #$ Substitute('$$WX_CFLAGS /Yu"wx/wxprec.h" /FD /c');
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
@@ -118,8 +131,8 @@ LIB32=link.exe -lib
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "wxWindows - Win32 Release"
|
||||
# Name "wxWindows - Win32 Debug"
|
||||
# Name #$Substitute('"$$PROJECTNAME - Win32 Release"');
|
||||
# Name #$Substitute('"$$PROJECTNAME - Win32 Debug"');
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
@@ -139,11 +152,11 @@ SOURCE=.\src\msw\dummy.cpp
|
||||
|
||||
SOURCE=.\src\common\y_tab.c
|
||||
|
||||
!IF "$(CFG)" == "wxWindows - Win32 Release"
|
||||
!IF "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Release"');
|
||||
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug"
|
||||
!ELSEIF "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Debug"');
|
||||
|
||||
# ADD CPP /W1
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
@@ -2,8 +2,13 @@
|
||||
#! File: vc6dll.t
|
||||
#! Purpose: tmake template file from which wxWinDll.dsp is generated by running
|
||||
#! tmake -t vc6dll wxwin.pro -o wxWinDll.dsp
|
||||
#!
|
||||
#! you may also generate the project file for the Unicode DLL build:
|
||||
#! tmake -t vc6dll wxwin.pro -o wxWinDll.dsp CONFIG+=unicode
|
||||
#!
|
||||
#! Author: Vadim Zeitlin
|
||||
#! Created: 13.10.99
|
||||
#! Modified:11.08.00 by VZ to allow generating wxWinDllU.dsp from ti too
|
||||
#! Version: $Id$
|
||||
#!#############################################################################
|
||||
#${
|
||||
@@ -37,28 +42,44 @@
|
||||
next if $wxHTML{$file} =~ /\b16\b/;
|
||||
$project{"WXHTMLSRCS"} .= $file . " "
|
||||
}
|
||||
|
||||
$project{"WX_CFLAGS"} = "/D __WXMSW__ /D __WIN95__ /D __WINDOWS__ /D __WIN32__ /D WXMAKINGDLL";
|
||||
if ( Config("unicode") ) {
|
||||
$project{"OUTDIR_SUFFIX"} = "UnicodeDll";
|
||||
$project{"DLLNAME"} = $project{"OUTDIR_SUFFIX"} . "/wxmsw221u";
|
||||
$project{"WX_CFLAGS"} .= " /D _UNICODE /D UNICODE ";
|
||||
$project{"PROJECTNAME"} = "wxWinDllU";
|
||||
}
|
||||
else {
|
||||
$project{"OUTDIR_SUFFIX"} = "Dll";
|
||||
$project{"DLLNAME"} = $project{"OUTDIR_SUFFIX"} . "/wxmsw221";
|
||||
$project{"PROJECTNAME"} = "wxWinDll";
|
||||
}
|
||||
|
||||
$project{"MAKEFILE"} = $project{"PROJECTNAME"} . ".mak";
|
||||
$project{"DEBUG_DLLNAME"} = $project{"DLLNAME"} . "d";
|
||||
#$}
|
||||
# Microsoft Developer Studio Project File - Name="wxWinDll" - Package Owner=<4>
|
||||
# Microsoft Developer Studio Project File - #$ Substitute('Name="$$PROJECTNAME" - Package Owner=<4>');
|
||||
# Microsoft Developer Studio Generated Build File, Format Version 6.00
|
||||
# ** DO NOT EDIT **
|
||||
|
||||
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
|
||||
|
||||
CFG=wxWinDll - Win32 Debug
|
||||
CFG=#$ Substitute('$$PROJECTNAME - Win32 Debug');
|
||||
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
|
||||
!MESSAGE use the Export Makefile command and run
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "wxWinDll.mak".
|
||||
!MESSAGE NMAKE /f "#$ ExpandGlue('MAKEFILE','','','".');
|
||||
!MESSAGE
|
||||
!MESSAGE You can specify a configuration when running NMAKE
|
||||
!MESSAGE by defining the macro CFG on the command line. For example:
|
||||
!MESSAGE
|
||||
!MESSAGE NMAKE /f "wxWinDll.mak" CFG="wxWinDll - Win32 Debug"
|
||||
!MESSAGE NMAKE /f #$ Substitute('"$$MAKEFILE" CFG="$$PROJECTNAME - Win32 Debug"');
|
||||
!MESSAGE
|
||||
!MESSAGE Possible choices for configuration are:
|
||||
!MESSAGE
|
||||
!MESSAGE "wxWinDll - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE "wxWinDll - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
|
||||
!MESSAGE #$ Substitute('"$$PROJECTNAME - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")');
|
||||
!MESSAGE #$ Substitute('"$$PROJECTNAME - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")');
|
||||
!MESSAGE
|
||||
|
||||
# Begin Project
|
||||
@@ -69,21 +90,21 @@ CPP=cl.exe
|
||||
MTL=midl.exe
|
||||
RSC=rc.exe
|
||||
|
||||
!IF "$(CFG)" == "wxWinDll - Win32 Release"
|
||||
!IF "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Release"');
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 0
|
||||
# PROP BASE Output_Dir "Release"
|
||||
# PROP BASE Intermediate_Dir "Release"
|
||||
# PROP BASE Output_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
|
||||
# PROP BASE Intermediate_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 0
|
||||
# PROP Output_Dir "ReleaseDLL"
|
||||
# PROP Intermediate_Dir "ReleaseDLL"
|
||||
# PROP Output_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
|
||||
# PROP Intermediate_Dir #$ Substitute('"Release$$OUTDIR_SUFFIX"');
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W4 /GX /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "NDEBUG" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /c
|
||||
# ADD BASE CPP /nologo /MD /W4 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W4 /GX /O1 /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "NDEBUG" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" #$ Substitute('$$WX_CFLAGS /Yu"wx/wxprec.h" /FD /c');
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "NDEBUG"
|
||||
@@ -92,24 +113,24 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 /out:"ReleaseDll/wxmsw221.dll"
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 #$ Substitute('/out:"Release$$DLLNAME.dll"');
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Release\jpeg.lib src\tiff\Release\tiff.lib src\png\Release\png.lib src\xpm\Release\xpm.lib src\zlib\Release\zlib.lib /nologo /dll /machine:I386 #$ Substitute('/out:"Release$$DLLNAME.dll"');
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWinDll - Win32 Debug"
|
||||
!ELSEIF "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Debug"');
|
||||
|
||||
# PROP BASE Use_MFC 0
|
||||
# PROP BASE Use_Debug_Libraries 1
|
||||
# PROP BASE Output_Dir "Debug"
|
||||
# PROP BASE Intermediate_Dir "Debug"
|
||||
# PROP BASE Output_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
|
||||
# PROP BASE Intermediate_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
|
||||
# PROP BASE Target_Dir ""
|
||||
# PROP Use_MFC 0
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "DebugDLL"
|
||||
# PROP Intermediate_Dir "DebugDLL"
|
||||
# PROP Output_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
|
||||
# PROP Intermediate_Dir #$ Substitute('"Debug$$OUTDIR_SUFFIX"');
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /D "__WXMSW__" /D "__WIN95__" /D "__WINDOWS__" /D "__WIN32__" /D "WXMAKINGDLL" /Yu"wx/wxprec.h" /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W4 /Gm /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /I "$(wx)\src\jpeg" /I "$(wx)\src\png" /I "$(wx)\src\tiff" /D "_DEBUG" /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" #$ Substitute('$$WX_CFLAGS /Yu"wx/wxprec.h" /FD /GZ /c');
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x409 /d "_DEBUG"
|
||||
@@ -118,15 +139,15 @@ BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll"
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /out:"DebugDll/wxmsw221d.dll"
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /dll /debug /machine:I386 /pdbtype:sept #$ Substitute('/out:"Debug$$DEBUG_DLLNAME.dll"');
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib src\jpeg\Debug\jpeg.lib src\tiff\Debug\tiff.lib src\png\Debug\png.lib src\xpm\Debug\xpm.lib src\zlib\Debug\zlib.lib /nologo /dll /debug /machine:I386 /pdbtype:sept #$ Substitute('/out:"Debug$$DEBUG_DLLNAME.dll"');
|
||||
|
||||
!ENDIF
|
||||
|
||||
# Begin Target
|
||||
|
||||
# Name "wxWinDll - Win32 Release"
|
||||
# Name "wxWinDll - Win32 Debug"
|
||||
# Name #$Substitute('"$$PROJECTNAME - Win32 Release"');
|
||||
# Name #$Substitute('"$$PROJECTNAME - Win32 Debug"');
|
||||
|
||||
# PROP Default_Filter ""
|
||||
# Begin Source File
|
||||
@@ -150,12 +171,12 @@ SOURCE=.\src\msw\version.rc
|
||||
|
||||
SOURCE=.\src\common\y_tab.c
|
||||
|
||||
!IF "$(CFG)" == "wxWinDll - Win32 Release"
|
||||
!IF "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Release"');
|
||||
|
||||
# ADD CPP /W1
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
!ELSEIF "$(CFG)" == "wxWinDll - Win32 Debug"
|
||||
!ELSEIF "$(CFG)" == #$ Substitute('"$$PROJECTNAME - Win32 Debug"');
|
||||
|
||||
# ADD CPP /W1
|
||||
# SUBTRACT CPP /YX /Yc /Yu
|
||||
|
||||
@@ -52,6 +52,14 @@
|
||||
$EXTRA_LIBS=Config("wxbase") ? "" : "xpm zlib png jpeg tiff";
|
||||
}
|
||||
|
||||
if ( Config("unicode") ) {
|
||||
if ( Config("dll") ) { $DLL_SUFFIX = "ud"; }
|
||||
$UNICODE_FLAGS="/D _UNICODE /D UNICODE";
|
||||
}
|
||||
else {
|
||||
$UNICODE_FLAGS="";
|
||||
}
|
||||
|
||||
#! let's be smarter: first of all, if no extension is given, add .lib
|
||||
#! (this allows for LIBS=libname in project files which map either on
|
||||
#! -l libname.lib under Windows or on -llibname under Unix).
|
||||
|
||||
Reference in New Issue
Block a user