Renamed .nt makefiles to .vc and factored them out; made DND sample compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
@@ -25,7 +25,6 @@ int yyback(int *, int);
|
||||
|
||||
/* You may need to put /DLEX_SCANNER in your makefile
|
||||
* if you're using LEX!
|
||||
Last change: JS 13 Jul 97 6:12 pm
|
||||
*/
|
||||
#ifdef LEX_SCANNER
|
||||
/* int yyoutput(int); */
|
||||
|
||||
@@ -20,10 +20,6 @@
|
||||
#include "wx/utils.h"
|
||||
#include "wx/dcclient.h"
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#include "windows.h"
|
||||
#endif
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
@@ -40,6 +36,10 @@ END_EVENT_TABLE()
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxWindow)
|
||||
#endif
|
||||
|
||||
#ifdef __WXMSW__
|
||||
#include "windows.h"
|
||||
#endif
|
||||
|
||||
wxScrolledWindow::wxScrolledWindow(void)
|
||||
{
|
||||
m_xScrollPixelsPerLine = 0;
|
||||
@@ -110,6 +110,7 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
|
||||
if (do_refresh && !noRefresh) Refresh();
|
||||
|
||||
#ifdef __WXMSW__
|
||||
// Necessary?
|
||||
UpdateWindow ((HWND) GetHWND());
|
||||
#endif
|
||||
}
|
||||
@@ -420,6 +421,7 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
|
||||
Refresh();
|
||||
|
||||
#ifdef __WXMSW__
|
||||
// Necessary?
|
||||
::UpdateWindow ((HWND) GetHWND());
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# dll builds a library (wxdll.lib) suitable for creating DLLs
|
||||
# * Note that the dll target is experimental - see docs/dll.txt.
|
||||
#
|
||||
!include <ntwxwin.mak>
|
||||
!include <makevc.env>
|
||||
|
||||
THISDIR=$(WXWIN)\src
|
||||
|
||||
@@ -107,7 +107,7 @@ RANLIB = ranlib
|
||||
#COMPLIBS=-lgcc
|
||||
|
||||
# Compiler or system-specific include paths
|
||||
COMPPATHS=-I$(TWINDIR)/include -DTWIN32 -D__TWIN32__
|
||||
COMPPATHS=
|
||||
|
||||
########################## Directories ###############################
|
||||
|
||||
|
||||
42
src/makelib.vc
Normal file
42
src/makelib.vc
Normal file
@@ -0,0 +1,42 @@
|
||||
#
|
||||
# File: makelib.vc
|
||||
# Author: Julian Smart
|
||||
# Created: 1999
|
||||
# Updated:
|
||||
# Copyright: (c) Julian Smart
|
||||
#
|
||||
# Makefile : Builds a library for a utility
|
||||
# Use FINAL=1 argument to nmake to build final version with no debugging
|
||||
# info
|
||||
|
||||
# Set WXDIR for your system
|
||||
WXDIR = $(WXWIN)
|
||||
|
||||
!include $(WXDIR)\src\makevc.env
|
||||
|
||||
all: $(LIBTARGET)
|
||||
|
||||
wx:
|
||||
cd $(WXDIR)\src\msw
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
|
||||
wxclean:
|
||||
cd $(WXDIR)\src\msw
|
||||
nmake -f makefile.vc clean
|
||||
|
||||
$(LIBTARGET): $(OBJECTS)
|
||||
-erase $(LIBTARGET)
|
||||
$(implib) @<<
|
||||
-out:$(LIBTARGET)
|
||||
-machine:$(CPU)
|
||||
$(OBJECTS)
|
||||
<<
|
||||
|
||||
clean:
|
||||
-erase $(LIBTARGET)
|
||||
-erase $(OBJECTS)
|
||||
-erase *.exe
|
||||
-erase *.res
|
||||
-erase *.map
|
||||
-erase *.sbr
|
||||
-erase *.pdb
|
||||
@@ -1,3 +1,4 @@
|
||||
# Make environment for making samples on Unix
|
||||
# Replace this with your own path if necessary
|
||||
WXDIR = $(WXWIN)
|
||||
#WXDIR = /home/jacs/wx2
|
||||
|
||||
49
src/makeprog.vc
Normal file
49
src/makeprog.vc
Normal file
@@ -0,0 +1,49 @@
|
||||
#
|
||||
# File: makefile.nt
|
||||
# Author: Julian Smart
|
||||
# Created: 1999
|
||||
# Updated:
|
||||
# Copyright: (c) Julian Smart
|
||||
#
|
||||
# Makefile environment for building samples. Include this from
|
||||
# your own makefile.
|
||||
# Use FINAL=1 argument to nmake to build final version with no debugging
|
||||
# info
|
||||
|
||||
# Set WXDIR for your system
|
||||
WXDIR = $(WXWIN)
|
||||
|
||||
WXUSINGDLL=0
|
||||
|
||||
!include $(WXDIR)\src\makevc.env
|
||||
|
||||
all: $(PROGRAM).exe $(EXTRATARGETS)
|
||||
|
||||
wx:
|
||||
cd $(WXDIR)\src\msw
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
# cd $(THISDIR)
|
||||
|
||||
wxclean:
|
||||
cd $(WXDIR)\src\msw
|
||||
nmake -f makefile.vc clean
|
||||
# cd $(THISDIR)
|
||||
|
||||
$(PROGRAM).exe: $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
|
||||
$(link) @<<
|
||||
-out:$(PROGRAM).exe
|
||||
$(LINKFLAGS)
|
||||
$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res
|
||||
$(LIBS)
|
||||
<<
|
||||
|
||||
$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
|
||||
$(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
|
||||
|
||||
clean:
|
||||
-erase $(OBJECTS)
|
||||
-erase *.exe
|
||||
-erase *.res
|
||||
-erase *.map
|
||||
-erase *.sbr
|
||||
-erase *.pdb
|
||||
@@ -26,9 +26,10 @@
|
||||
#include "wx/window.h"
|
||||
#endif
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
#include "wx/msw/accel.h"
|
||||
|
||||
#include "wx/msw/private.h"
|
||||
|
||||
#ifdef LoadAccelerators
|
||||
#undef LoadAccelerators
|
||||
#endif
|
||||
|
||||
@@ -691,7 +691,7 @@ $(CFG): makefile.b32
|
||||
-WE
|
||||
-tWM
|
||||
|
||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
|
||||
-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm
|
||||
-I$(WXDIR)\include\wx\msw\gnuwin32
|
||||
|
||||
-L$(BCCDIR)\lib
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# dll builds a library (wxdll.lib) suitable for creating DLLs
|
||||
# * Note that the dll target is experimental - see docs/dll.txt.
|
||||
#
|
||||
!include <..\ntwxwin.mak>
|
||||
!include <..\makevc.env>
|
||||
|
||||
THISDIR=$(WXWIN)\src\msw
|
||||
|
||||
@@ -241,15 +241,15 @@ all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm $(LIBTARGET)
|
||||
|
||||
# wxWindows library as DLL
|
||||
dll:
|
||||
nmake -f makefile.nt all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1
|
||||
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1
|
||||
|
||||
# wxWindows + app as DLL. Only affects main.cpp.
|
||||
dllapp:
|
||||
nmake -f makefile.nt all FINAL=$(FINAL) DLL=1
|
||||
nmake -f makefile.vc all FINAL=$(FINAL) DLL=1
|
||||
|
||||
# wxWindows + app as DLL, for Netscape plugin - remove DllMain.
|
||||
dllnp:
|
||||
nmake -f makefile.nt all NOMAIN=1 FINAL=$(FINAL) DLL=1
|
||||
nmake -f makefile.vc all NOMAIN=1 FINAL=$(FINAL) DLL=1
|
||||
|
||||
# Use this to make dummy.obj and generate a PCH.
|
||||
# You might use the dll target, then the pch target, in order to
|
||||
@@ -262,7 +262,7 @@ dllnp:
|
||||
# or an app is calling the DLL exported functionality (WXDLLEXPORT is different
|
||||
# in each case) so you couldn't use the same PCH.
|
||||
pch:
|
||||
nmake -f makefile.nt pch1 WXUSINGDLL=1
|
||||
nmake -f makefile.vc pch1 WXUSINGDLL=1
|
||||
|
||||
pch1: $(DUMMYOBJ)
|
||||
|
||||
@@ -1199,37 +1199,37 @@ $(OBJECTS): $(WXDIR)/include/wx/setup.h
|
||||
|
||||
png:
|
||||
cd $(WXDIR)\src\png
|
||||
nmake -f makefile.nt FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_png:
|
||||
cd $(WXDIR)\src\png
|
||||
nmake -f makefile.nt clean
|
||||
nmake -f makefile.vc clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
zlib:
|
||||
cd $(WXDIR)\src\zlib
|
||||
nmake -f makefile.nt FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_zlib:
|
||||
cd $(WXDIR)\src\zlib
|
||||
nmake -f makefile.nt clean
|
||||
nmake -f makefile.vc clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
xpm:
|
||||
cd $(WXDIR)\src\xpm
|
||||
nmake -f makefile.nt FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean_xpm:
|
||||
cd $(WXDIR)\src\xpm
|
||||
nmake -f makefile.nt clean
|
||||
nmake -f makefile.vc clean
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
rcparser:
|
||||
cd $(WXDIR)\utils\rcparser\src
|
||||
nmake -f makefile.nt FINAL=$(FINAL)
|
||||
nmake -f makefile.vc FINAL=$(FINAL)
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm
|
||||
@@ -1301,99 +1301,99 @@ portingps: $(WXDIR)\docs\ps\porting.ps
|
||||
|
||||
allhlp: wxhlp portinghlp prop # faqhlp
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
nmake -f makefile.nt hlp
|
||||
nmake -f makefile.vc hlp
|
||||
cd $(THISDIR)
|
||||
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\wxhelp2\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\prologio\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\tex2rtf\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\wxgraph\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\wxchart\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\wxtree\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\wxbuild\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\wxgrid\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\wxtab\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
|
||||
# cd $(WXDIR)\utils\wxclips\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
# cd $(WXDIR)\utils\clips2c\src
|
||||
# nmake -f makefile.nt hlp
|
||||
# nmake -f makefile.vc hlp
|
||||
|
||||
allhtml: wxhtml portinghtml prophtml # faqhtml
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
nmake -f makefile.nt html
|
||||
nmake -f makefile.vc html
|
||||
cd $(THISDIR)
|
||||
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\dialoged\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\hytext\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\wxhelp2\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\prologio\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\tex2rtf\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\wxgraph\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\wxchart\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\wxtree\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\wxtab\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
|
||||
# cd $(WXDIR)\utils\wxclips\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
# cd $(WXDIR)\utils\clips2c\src
|
||||
# nmake -f makefile.nt html
|
||||
# nmake -f makefile.vc html
|
||||
|
||||
allps: wxps referencps portingps propps # faqps
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
nmake -f makefile.nt ps
|
||||
nmake -f makefile.vc ps
|
||||
cd $(THISDIR)
|
||||
|
||||
allpdfrtf: pdfrtf portingpdfrtf proppdfrtf # faqpdfrtf
|
||||
cd $(WXDIR)\utils\dialoged\src
|
||||
nmake -f makefile.nt pdfrtf
|
||||
nmake -f makefile.vc pdfrtf
|
||||
cd $(THISDIR)
|
||||
|
||||
# cd $(WXDIR)\utils\wxhelp\src
|
||||
# nmake -f makefile.nt ps
|
||||
# nmake -f makefile.vc ps
|
||||
# cd $(WXDIR)\utils\wxhelp2\src
|
||||
# nmake -f makefile.nt ps
|
||||
# nmake -f makefile.vc ps
|
||||
# cd $(WXDIR)\utils\tex2rtf\src
|
||||
# nmake -f makefile.nt ps
|
||||
# nmake -f makefile.vc ps
|
||||
# cd $(WXDIR)\utils\wxgraph\src
|
||||
# nmake -f makefile.nt ps
|
||||
# nmake -f makefile.vc ps
|
||||
# cd $(WXDIR)\utils\wxchart\src
|
||||
# nmake -f makefile.nt ps
|
||||
# nmake -f makefile.vc ps
|
||||
# cd $(WXDIR)\utils\wxtree\src
|
||||
# nmake -f makefile.nt ps
|
||||
# nmake -f makefile.vc ps
|
||||
# cd $(THISDIR)
|
||||
|
||||
# cd $(WXDIR)\utils\wxtab\src
|
||||
# nmake -f makefile.nt ps
|
||||
# nmake -f makefile.vc ps
|
||||
# cd $(WXDIR)\utils\prologio\src
|
||||
# nmake -f makefile.nt ps
|
||||
# nmake -f makefile.vc ps
|
||||
# cd $(WXDIR)\utils\wxclips\src
|
||||
# nmake -f makefile.nt ps
|
||||
# nmake -f makefile.vc ps
|
||||
# cd $(WXDIR)\utils\clips2c\src
|
||||
# nmake -f makefile.nt ps
|
||||
# nmake -f makefile.vc ps
|
||||
|
||||
$(DOCDIR)/winhelp/wx.hlp: $(DOCDIR)/latex/wx/wx.rtf $(DOCDIR)/latex/wx/wx.hpj
|
||||
cd $(DOCDIR)/latex/wx
|
||||
173
src/ntwxwin.mak
173
src/ntwxwin.mak
@@ -1,172 +1,3 @@
|
||||
#
|
||||
# File: ntwxwin.env
|
||||
# Author: Ulrich Leodolter
|
||||
# Created: Wed May 17 08:36:42 1995
|
||||
# Updated:
|
||||
#
|
||||
# MSVC++ 32-bit makefile include file
|
||||
#
|
||||
!include <ntwin32.mak>
|
||||
|
||||
WIN95=1
|
||||
|
||||
!if "$(WIN95)" == "0"
|
||||
# With 3.50, Win95 will use your existing icons to show smaller ones.
|
||||
# With 4.0, you'll have to follow Win95 procedures for icons or you'll get the
|
||||
# default Windows icon.
|
||||
APPVER=3.50
|
||||
WINVERSION=-DWINVER=0x0350 # Generic WIN32
|
||||
!else
|
||||
APPVER=3.50 # 4.0
|
||||
# This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).
|
||||
WINVERSION=-DWINVER=0x0400 /D__WIN95__
|
||||
!endif
|
||||
|
||||
# On Alpha machines, change to CPU=ALPHA
|
||||
CPU=i386
|
||||
|
||||
# Suffixes
|
||||
OBJSUFF=obj
|
||||
SRCSUFF=cpp
|
||||
|
||||
# If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally
|
||||
WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
|
||||
#WINLINKFLAGS=/NODEFAULTLIB /INCREMENTAL:NO /NOLOGO -align:0x1000 -machine:$(CPU) -subsystem:windows,$(APPVER)
|
||||
WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
|
||||
#WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib libc.lib oldnames.lib\
|
||||
# comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib # libci.lib # libci.lib required for VC++ 4.2
|
||||
WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\
|
||||
comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib # libci.lib # libci.lib required for VC++ 4.2
|
||||
|
||||
# Change this to your WXWIN directory
|
||||
WXDIR=$(WXWIN)
|
||||
|
||||
WXSRC=$(WXDIR)\src\msw
|
||||
WXINC=$(WXDIR)\include
|
||||
WXBASESRC=$(WXDIR)\src\common
|
||||
|
||||
#####################################################################
|
||||
# These are the possible DLL/non-DLL usages:
|
||||
#
|
||||
# Type _DLL/_WINDLL WXUSINGDLL WXMAKINGDLL Library
|
||||
#--------------------------------------------------------------------
|
||||
# Normal application - - - wx.lib
|
||||
#
|
||||
# wxWin as DLL Defined - Defined wx200.lib
|
||||
#
|
||||
# App using wxWin DLL - Defined - wx200.lib
|
||||
#
|
||||
# App built as one DLL Defined - - wx.lib
|
||||
#
|
||||
######################################################################
|
||||
#
|
||||
# Compiling your app:
|
||||
#--------------------
|
||||
# when compiling an app to use the DLL version of wxWindows
|
||||
# (but not to be a DLL itself), set WXUSINGDLL to 1 in your
|
||||
# makefile just before including ntwxwin.mak.
|
||||
# To compile wxWin _and_ app itself as a DLL, set DLL to 1
|
||||
# in ntwxwin.mak, and do not set WXUSINGDLL.
|
||||
#
|
||||
# Compiling wxWindows:
|
||||
#---------------------
|
||||
# Use the dll target to compile wxWindows as DLL; then make 'pch'
|
||||
# to generate a precompiled header for your apps to use. BUG: must compile without
|
||||
# wxExpr (USE_WX_RESOURCES = 0) for this to link properly. Don't know why yet.
|
||||
# Use the dllapp target to compile wxWindows for making a DLL app (not implemented yet)
|
||||
|
||||
#DLL=0
|
||||
|
||||
!if "$(WXUSINGDLL)" == "1" || "$(WXMAKINGDLL)" == "1"
|
||||
WXLIB=$(WXDIR)\lib\wx200.lib
|
||||
!else
|
||||
WXLIB=$(WXDIR)\lib\wx.lib
|
||||
!endif
|
||||
|
||||
!if "$(WXUSINGDLL)" == "1"
|
||||
EXTRADLLFLAGS=/DWXUSINGDLL=1
|
||||
!endif
|
||||
|
||||
!if "$(WXMAKINGDLL)" == "1"
|
||||
EXTRADLLFLAGS=/DWXMAKINGDLL=1
|
||||
!endif
|
||||
|
||||
!if "$(WXMAKINGDLL)" == "0" && "$(DLL)" == "1"
|
||||
EXTRADLLFLAGS=
|
||||
!endif
|
||||
|
||||
!if "$(NOMAIN)" == "1"
|
||||
EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN
|
||||
!endif
|
||||
|
||||
INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC)
|
||||
LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib
|
||||
|
||||
!ifndef FINAL
|
||||
FINAL=0
|
||||
DEBUG=1
|
||||
!endif
|
||||
|
||||
!ifndef DLL
|
||||
DLL=0
|
||||
!endif
|
||||
|
||||
# Set this to 1 if you don't want to use precompiled headers
|
||||
!ifndef NOPCH
|
||||
NOPCH=0
|
||||
!endif
|
||||
|
||||
MAKEPRECOMP=/YcWX/WXPREC.H
|
||||
OPTIONS=
|
||||
|
||||
!if "$(FINAL)" == "0"
|
||||
OPT = /Od /Gy
|
||||
# ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated
|
||||
DEBUG_FLAGS= /Zi /D__WXDEBUG__ # /DDEBUG=1 # /FR
|
||||
LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE
|
||||
CRTFLAG=/MD
|
||||
!else
|
||||
# /O1 - smallest code
|
||||
# /O2 - fastest code
|
||||
OPT = /O1 # /O2 # /Od
|
||||
DEBUG_FLAGS=
|
||||
LINK_DEBUG_FLAGS=/RELEASE
|
||||
CRTFLAG=/MD
|
||||
!endif
|
||||
|
||||
!if "$(DLL)" == "0"
|
||||
|
||||
!if "$(NOPCH)" == "1"
|
||||
PCH=
|
||||
PRECOMP=
|
||||
MAKEPRECOMP=
|
||||
!else
|
||||
PCH=WX.PCH
|
||||
PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
|
||||
MAKEPRECOMP=/YcWX/WXPREC.H
|
||||
!endif
|
||||
|
||||
CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS)
|
||||
# If you don't include wxprec.h, use CPPFLAGS2
|
||||
CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS)
|
||||
LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
|
||||
DUMMY=dummy
|
||||
|
||||
!else
|
||||
|
||||
!if "$(WXMAKINGDLL)" == "1"
|
||||
PCH=WXDLL.PCH
|
||||
DUMMY=dummydll
|
||||
!else
|
||||
PCH=WX.PCH
|
||||
DUMMY=dummy
|
||||
!endif
|
||||
|
||||
PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
|
||||
CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
|
||||
CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
|
||||
LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
|
||||
!endif
|
||||
|
||||
DUMMYOBJ=$(WXDIR)\src\msw\$(DUMMY).obj
|
||||
# Compatibility only: use makevc.env
|
||||
|
||||
!include $(WXWIN)\src\makevc.env
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#
|
||||
# File: makefile.nt
|
||||
# File: makefile.vc
|
||||
# Author: Julian Smart
|
||||
# Created: 1997
|
||||
# Updated:
|
||||
@@ -9,7 +9,7 @@
|
||||
#
|
||||
# Makefile : Builds xpm.lib for VC++ (32-bit)
|
||||
#
|
||||
!include <..\ntwxwin.mak>
|
||||
!include <..\makevc.env>
|
||||
|
||||
THISDIR=$(WXWIN)\src\xpm
|
||||
|
||||
Reference in New Issue
Block a user