From 114cdc750b1a8432a185f2125fac40ad89143ebf Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 8 Feb 2007 15:09:45 +0000 Subject: [PATCH] removed obsolete makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/makeb32.env | 173 ------------------- src/makebcc.env | 34 ---- src/makefile.va | 35 ---- src/makefile.vc | 35 ---- src/makeg95.env | 437 ----------------------------------------------- src/makelib.b32 | 32 ---- src/makelib.bcc | 37 ---- src/makelib.g95 | 24 --- src/makelib.vc | 49 ------ src/makemsc.env | 72 -------- src/makeprog.b32 | 118 ------------- src/makeprog.bcc | 35 ---- src/makeprog.g95 | 32 ---- src/makeprog.sl | 28 --- src/makeprog.va | 59 ------- src/makeprog.vc | 79 --------- src/makesl.env | 53 ------ src/makeva.env | 200 ---------------------- src/makevc.env | 335 ------------------------------------ src/ntwxwin.mak | 3 - src/version.mak | 24 --- 21 files changed, 1894 deletions(-) delete mode 100644 src/makeb32.env delete mode 100644 src/makebcc.env delete mode 100644 src/makefile.va delete mode 100644 src/makefile.vc delete mode 100644 src/makeg95.env delete mode 100644 src/makelib.b32 delete mode 100644 src/makelib.bcc delete mode 100644 src/makelib.g95 delete mode 100644 src/makelib.vc delete mode 100644 src/makemsc.env delete mode 100644 src/makeprog.b32 delete mode 100644 src/makeprog.bcc delete mode 100644 src/makeprog.g95 delete mode 100644 src/makeprog.sl delete mode 100644 src/makeprog.va delete mode 100644 src/makeprog.vc delete mode 100644 src/makesl.env delete mode 100644 src/makeva.env delete mode 100644 src/makevc.env delete mode 100644 src/ntwxwin.mak delete mode 100644 src/version.mak diff --git a/src/makeb32.env b/src/makeb32.env deleted file mode 100644 index 21351f5b01..0000000000 --- a/src/makeb32.env +++ /dev/null @@ -1,173 +0,0 @@ -# Common settings for Borland 32-bit compilation (makefile.b32 files) - -!if "$(RM)" == "" -RM= del -!endif - -BORLAND_SUFFIX=bc -DEBUG_SUFFIX= - -MAKEFLAGS=FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) OUTPUTDIR=$(OUTPUTDIR) EXEDIR=$(EXEDIR) - -WXDIR = $(WXWIN) -CFG = wxw32 - -!ifndef OUTPUTDIR -OBJ_PATH=$(WXDIR)\BORL -OUTPUTDIR=$(WXDIR)\BORL -!else -OBJ_PATH=$(OUTPUTDIR) -!endif - -!ifndef BCCDIR -BCCDIR=$(MAKEDIR)\.. -!endif - -!if "$(BCCDIR)" == "\.." -!error Your Borland compiler does not define MAKEDIR. Pleasedefine the BCCDIR variable in makeb32.env line 10, e.g. BCCDIR=d:\bc4 -!endif - -ARCHINCDIR=$(WXDIR)\lib\$(BORLAND_SUFFIX) -ARCHSETUPH=$(ARCHINCDIR)\wx\setup.h -#see below for SETUPSRCDIR - -!ifndef WXLIBDIR -WXLIBDIR = $(WXDIR)\lib -!endif - -WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc;$(WXDIR)\src\regex; -WIN95FLAG = -D__WIN95__ -D__WINDOWS__ -RFLAGS = -i$(WXDIR)\include;$(WXDIR)\src - -# This should be changed to tlink32 if ilink32 is not available. -# Ilink32 is available on BC++ 5.02 and above, and all -# versions of C++ Builder. -!ifndef LINK -LINK=ilink32 -#LINK=tlink32 -!endif - -!ifndef FINAL -FINAL=0 -!endif - -!ifndef WXMAKINGDLL -WXMAKINGDLL=0 -!endif - -!if "$(FINAL)" == "1" -OPT = -O2 -DEBUG_FLAGS = -DUSE_DEFINE -LINKDEBUGFLAGS= -!else -OPT = -Od -DEBUG_FLAGS= -v -DWXDEBUG=1 -D__WXDEBUG__ -DUSE_DEFINE -LINKDEBUGFLAGS=/v -!endif - -# allow to use debugger but no wxDebugging functions -!if "$(FINAL)" == "hybrid" -OPT = -Od -DEBUG_FLAGS= -v -LINKDEBUGFLAGS=/v -!endif - -!ifndef DLL -DLL=0 -!else -DLL=1 -WXMAKINGDLL=1 -!endif - -# Target WXMAKINGDLL WXUSINGDLL WXBUILDDLL -# wxWin DLL 1 0 1 -# wxWin STATIC 0 0 0 -# App use wxWin DLL 0 1 0 -# DLL use wxWin DLL 0 1 1 -# DLL use wxWin STATIC 0 0 1 -# - -# Determine the library name depending on the options, to allow -# multiple versions to coexist. -# Note that the clean target will only delete the appropriate .lib for the current -# options and all the obj files, and note that you must delete the obj files if you -# change the options so that they are compiled using the correct ones. - -WXLIBNAME=wx25 - - -## Use this if you want to use the UNIV controls set rather than the native ones -## make -f makefile.b32 WXUSINGUNIV=1 -!if "$(WXUSINGUNIV)" == "1" -USE_UNIV="UNIV" -BORLAND_SUFFIX=$(BORLAND_SUFFIX)v -ARCHINCDIR=$(ARCHINCDIR)v -SETUPSRCDIR=$(WXDIR)\include\wx\univ -PORT=__WXUNIVERSAL__ -!else -USE_UNIV="" -PORT=__WXMSW__ -SETUPSRCDIR=$(WXDIR)\include\wx\msw -!endif - -#unicode builds handled inside setup.h - -#a hybrid , does not set __WXDEBUG__ but sets -v (see above) -!if "$(FINAL)" == "hybrid" -DEBUG_SUFFIX=$(DEBUG_SUFFIX)h -!endif - -!if "$(FINAL)" == "0" -DEBUG_SUFFIX=$(DEBUG_SUFFIX)d -!endif - -!if "$(wxUSE_GUI)" == "0" -BORLAND_SUFFIX=$(BORLAND_SUFFIX)b -CPPFLAGS=-DwxUSE_GUI=0 -!endif - -!if "$(WXMAKINGDLL)" != "1" && "$(WXUSINGDLL)" != "1" -BORLAND_SUFFIX=$(BORLAND_SUFFIX)s -!endif - -!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" -INCEXT=dll$(INCEXT) -!endif - -# final names determined here -WXLIB=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).lib -WXDLL=$(WXLIBDIR)\$(WXLIBNAME)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX).dll -LIBTARGET=$(WXLIBDIR)\$(LIBTARGET)_bc$(DEBUG_SUFFIX).lib -OBJ_PATH=$(OBJ_PATH)_$(BORLAND_SUFFIX)$(DEBUG_SUFFIX) - -!if "$(WXMAKINGDLL)" == "1" -DLL_FLAGS= -DWXMAKINGDLL=1 -D_RTLDLL -!else - -!if "$(WXUSINGDLL)" == "1" -DLL_FLAGS= -DWXUSINGDLL=1 -D_RTLDLL -!else -DLL_FLAGS= -!endif - -!endif - -!if "$(WXBUILDDLL)" == "1" -LINK_FLAGS= /Tpd /c $(EXTRALINKFLAGS) -!endif - -CFG=$(OBJ_PATH)\$(CFG).cfg -CPPFLAGS=$(CPPFLAGS) $(DLL_FLAGS) @$(CFG) $(EXTRACPPFLAGS) - -DUMMY=dummy - -SRCSUFF = cpp -OBJSUFF = obj - -WAITFLAG = /w - -.$(SRCSUFF).obj: - bcc32 $(CPPFLAGS) -c -n$(OBJ_PATH) {$< } - -.c.obj: - bcc32 $(CPPFLAGS) -P- -c -n$(OBJ_PATH) {$< } diff --git a/src/makebcc.env b/src/makebcc.env deleted file mode 100644 index e9c4876f74..0000000000 --- a/src/makebcc.env +++ /dev/null @@ -1,34 +0,0 @@ -# Common settings for Borland 16-bit compilation (makefile.bcc files) - -WXDIR = $(WXWIN) - -CFG = $(WXDIR)\src\msw\wxwin.cfg -WXLIBDIR = $(WXDIR)\lib -WXLIBDIR2 = $(WXDIR)\contrib\lib -WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include - -!ifndef FINAL -FINAL=0 -!endif - -!if "$(FINAL)" == "0" -LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(WXDIR)\contrib\lib;$(BCCDIR)\lib $(EXTRALINKFLAGS) -OPT = -Od -DEBUG_FLAGS= -v -D__WXDEBUG__ -!else -LINKFLAGS=/Twe /L$(WXDIR)\lib;$(WXDIR)\contrib\lib;$(BCCDIR)\lib $(EXTRALINKFLAGS) -OPT = -O2 -DEBUG_FLAGS = -!endif - -CPPFLAGS=$(DEBUG_FLAGS) $(OPT) $(EXTRACPPFLAGS) @$(CFG) -WXLIB= $(WXLIBDIR)\wx.lib - -SRCSUFF = cpp -OBJSUFF = obj - -.$(SRCSUFF).obj: - bcc $(CPPFLAGS) -c {$< } - -.c.obj: - bcc $(CPPFLAGS) -DUSE_DEFINE -P- -c {$< } diff --git a/src/makefile.va b/src/makefile.va deleted file mode 100644 index 3dcfcfe104..0000000000 --- a/src/makefile.va +++ /dev/null @@ -1,35 +0,0 @@ -# -# File: makefile.va -# Author: David Webster -# Created: 1999 -# Updated: -# Copyright: (c) 1999, David Webster -# -# "%W% %G%" -# -# Makefile : Builds wxWindows library wx.lib for VisualAge C++ V3.0 for OS/2 -# Arguments: -# -# FINAL=1 argument to nmake to build version with no debugging info. -# dll builds a library (wxdll.lib) suitable for creating DLLs -# * Note that the dll target is experimental - see docs/dll.txt. -# -!include - -THISDIR=$(WXDIR)\src - -all: - cd os2 - nmake -f makefile.va - cd $(THISDIR) - -clean: - cd os2 - nmake -f makefile.va clean - cd $(THISDIR) - -cleanall: - cd os2 - nmake -f makefile.va cleanall - cd $(THISDIR) - diff --git a/src/makefile.vc b/src/makefile.vc deleted file mode 100644 index ca8985bf2e..0000000000 --- a/src/makefile.vc +++ /dev/null @@ -1,35 +0,0 @@ -# -# File: makefile.nt -# Author: Julian Smart -# Created: 1997 -# Updated: -# Copyright: (c) 1997, Julian Smart -# -# "%W% %G%" -# -# Makefile : Builds wxWindows library wx.lib for VC++ (32-bit) -# Arguments: -# -# FINAL=1 argument to nmake to build version with no debugging info. -# dll builds a library (wxdll.lib) suitable for creating DLLs -# * Note that the dll target is experimental - see docs/dll.txt. -# -!include - -THISDIR=$(WXWIN)\src - -all: - cd msw - nmake -f makefile.vc - cd $(THISDIR) - -clean: - cd msw - nmake -f makefile.vc clean - cd $(THISDIR) - -cleanall: - cd msw - nmake -f makefile.vc cleanall - cd $(THISDIR) - diff --git a/src/makeg95.env b/src/makeg95.env deleted file mode 100644 index f235603377..0000000000 --- a/src/makeg95.env +++ /dev/null @@ -1,437 +0,0 @@ -# -# makeg95.env -# Common makefile settings for wxWindows programs -# This file is included by all the other makefiles, thus changes -# made here take effect everywhere (except where overriden). -# The settings are for GnuWin32-derived compilers, i.e. Cygwin and Mingw32. -# -# Customize this file to match your own settings. -# -# CVS_ID: $Id$ -# - -# The MINGW32 and MINGW32VERSION variables are preconfigured for -# MinGW gcc version 3.x and must both be changed for any version -# earlier than 3.0 or for cygwin. Editing this file is one way to -# change them. An easier way, at least with GNU make, is to override -# them on the command line, e.g. -# make MINGW32=0 MINGW32VERSION=2.8 -f makefile.g95 - -# If using Mingw32 (any version), set this to 1. -# If using Cygwin (any version), set this to 0. -# -# This agrees with the instructions given in docs/msw/install.txt . -# Earlier versions of this makefile suggested setting MINGW32=1 for -# recent versions of cygwin, but that would give the wrong dll entry -# point in src/msw/makefile.g95 . -# -# With cygwin, there are still some problems compiling wxWindows -# this way; './configure && make' may work better. -# -MINGW32=1 - -# set MIN_SUFFIX to nothing if you use only MinGW compiler, set it to -# something MinGW-specific if you want to build wxWindows with more than one -# compiler -ifeq ($(MINGW32),1) - MIN_SUFFIX=_min -else - MIN_SUFFIX=_cyg -endif - -# Set to your gcc version. Generally 'gcc --version' tells you -# which version you have. But it cannot distinguish between -# 2.95.2-1 and earlier suffix versions of 2.95 . In that case, -# inspect the dates of bin/gcc.exe and bin/ld.exe ; if they -# are at least -# 2000-01-21 for gcc.exe and -# 2000-02-04 for ld.exe -# then use '2.95-late'. -# -# gcc 2.8.x and earlier require struct-return workaround -#MINGW32VERSION=2.8 -# -# gcc 2.95.2 and earlier requires special thunk option -#MINGW32VERSION=2.9-early -# -# mingw gcc-2.95.2-1 supports '-shared' -# windres provided with gcc-2.95.2-1 supports temp file option -#MINGW32VERSION=2.95-late -# -# gcc 3.x provides a win32api.h header -MINGW32VERSION=3.0 - -# If you want to compile on Wine, simply uncomment this variable -# If you don't want to edit the file, you can simply define it -# on the command line like so: make WINE=1 -f makefile.g95 -#WINE=1 - -# Set this if you are using a cross-compiler, i.e. compiling on one system -# the program for another one -# CROSS=i386-mingw32- - -# If we're using MSYS, or other utilities that use forward slashes, -# you need to set this when invoking the makefile from DOS, or the -# wrong separators will be assumed. However, if you're using MSYS, -# you really ought to invoke the makefile from MSYS--or, even better, -# use the './configure && make' technique that MSYS is designed for. -ifndef WINE -#OSTYPE=msys -else -OSTYPE=msys -endif - -# If building DLL, the version -include $(WXDIR)/src/version.mak -WXVERSION=$(wxMAJOR_VERSION)$(wxMINOR_VERSION)$(wxRELEASE_NUMBER_IFUNSTABLE) - -ifndef UNICODE - UNICODE=0 -endif - -ifndef FINAL - FINAL=0 -endif - -ifndef wxUSE_GUI - wxUSE_GUI=1 -endif - -# Set to the appropriate remove command (must support forward slashes) -# You can get a suitable rm.exe from ports/mingw32/extra.zip on the ftp site. -RM=rm -f - -# Set to the appropriate copy command (must support forward slashes) -# You can get a suitable cp.exe from ports/mingw32/extra.zip on the ftp site. -COPY=cp - -########################## Compiler ################################## - -ifneq (,$(findstring $(MINGW32VERSION),2.8)) -# According to Guillermo Rodriguez Garcia , the -# -fno-pcc-struct-return option is needed to make the standard div() -# function work - otherwise it returns absolutely incorrect results -# which breaks the wxImage class. This was fixed on 1998-08-14 for -# mingw and cygwin. It is preferable not to use this option where it -# is not required, because it is documented to cause binary API -# incompatibility. - _STRUCT_RETURN_WORKAROUND=-fno-pcc-struct-return -# Really old versions of cygwin are thought to require extra headers. - ifneq ($(MINGW32),1) - GNUWIN32EXTRA=-I$(WXDIR)/include/wx/msw/gnuwin32 - endif -endif - -ifneq (,$(findstring $(MINGW32VERSION),2.8 2.9-early)) -# Earlier versions of this makefile defined the following macros -# explicitly; mingw versions since at least '2.95-late' define -# them already. - OBSOLETE_DEFINES = -D_X86_=1 -DWIN32 -D_WIN32 -D__WIN32__ -endif -# But cygwin doesn't define them, at least through its version -# 2.95.3-4 of gcc. -ifneq ($(MINGW32),1) - OBSOLETE_DEFINES = -D_X86_=1 -DWIN32 -D_WIN32 -D__WIN32__ -endif - -ifneq (,$(findstring $(MINGW32VERSION),2.8 2.9-early 2.95-late)) -# Versions prior to 3.0 require -fvtable-thunks for OLE support. -# All code must be built with this option, even C++ libraries you -# only link to, including system libraries. This option can cause -# subtle problems with multiple inheritance. - _THUNK_WORKAROUND=-fvtable-thunks -endif - -ifeq (,$(findstring $(MINGW32VERSION),2.8 2.9-early)) -# Versions since 2.95.2-1 support '-shared', which makes linking -# a dll *much* faster; and the accompanying windres supports -# '--use-temp-file', which is more robust. - LD_SUPPORTS_SHARED=yes - _USE_TEMP_FILE_IF_SUPPORTED=--use-temp-file -# Use the WIN32 wxDirDialog only if we have a recent mingw version - RECENT_MINGW=yes -endif - -ifeq (,$(findstring $(MINGW32VERSION),2.8 2.9-early 2.95-late)) -# Versions since 3.0 provide win32api.h . An old comment said to -# define this 'if you have w32api >= 0.5', but mingw 2.95.2-1 -# has no such header. -ifndef WINE - _USE_W32API_HEADER_IF_SUPPORTED = -DHAVE_W32API_H -endif -# -# Revision 1.70.2.6 of this file suggested '--pipe' for mingw but -# not for cygwin, and only for version 3.0 or later. Since then, -# the advice given here -# http://mail.gnu.org/pipermail/autoconf/2000-July/005479.html -# is followed, and '--pipe' is not used unless you specify it on -# the make command line, e.g. -# make CXXFLAGS=--pipe CFLAGS=--pipe -f makefile.g95 -# -endif - -# Define the C++ and C compiler respectively -ifndef WINE -CXX = $(CROSS)g++ -CC = $(CROSS)gcc -else -CXX = wineg++ -CC = winegcc -endif - -# Compiler used for LEX generated C -# For now at least, it can be the same as the regular C compiler -CCLEX = $(CROSS)$(CC) - -# This shouldn't be needed as make is supposed to define this -# variable itself. Uncomment it if your make complains. -#MAKE=make - -# LEX (currently unused) -# LEX=flex # -t -L - -# YACC (currently unused) -# YACC=byacc -# YACC=bison - -# Settings for Cyginw/Mingw32 -# Some versions of windres cannot cope with the --preprocessor -# option. Uncomment the RCPREPROCESSOR line below if yours can. -ifndef WINE -RESCOMP=$(CROSS)windres $(_USE_TEMP_FILE_IF_SUPPORTED) -else -RESCOMP=wrc -endif -RCINPUTSWITCH=-i -RCOUTPUTSWITCH=-o -RCINCSWITCH=--include-dir -RCDEFSWITCH=--define -# Note that this can cause windres to fail (Win95/98 problem?) -# but commenting out RCPREPROCESSOR then does the trick. -#RCPREPROCESSOR=--preprocessor "$(CXX) -c -E -xc-header -DRC_INVOKED" - -# Don't make this too long (e.g. by adding contrib/include/wx) because it will -# truncate the command line -RESFLAGS=$(RCPREPROCESSOR) $(RCINCSWITCH) $(WXDIR)/include $(RCEXTRAINC) $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH) __WIN95__ $(RCDEFSWITCH) __GNUWIN32__ - -# Needed to build a DLL if your linker does not support --shared option. -AS = $(CROSS)as -DLLTOOL = $(CROSS)dlltool - -########################## Compiler flags ############################# - -# Unicode defines -ifeq ($(UNICODE),1) - UNICODE_OPT = -D_UNICODE -DUNICODE -DwxUSE_UNICODE=1 -else - UNICODE_OPT = -endif - -# Miscellaneous compiler options -OPTIONS = -DSTRICT $(_USE_W32API_HEADER_IF_SUPPORTED) - -# Add "-mthreads" if you want to have threads under mingw32 -# Add "-mno-cygwin" if you want to link with msvcrt.dll in Cywin and Wine -# Otherwise, you link against the native runtime (cygwin.dll -# or libc). Having the flag in mingw32 does not hurt as you -# always link against msvcrt.dll By default it should be on, -# to minimize dependencies on Cygwin, and have more correct -# filename behaviour in Wine. -COMMON_FLAGS = -mno-cygwin # -mthreads - -# Debugging information -ifeq ($(FINAL),0) - DEBUGFLAGS = -g -D__WXDEBUG__ -endif - -WIN95=1 - -ifeq ($(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 -D__GNUWIN32__ # Generic WIN32 -else -APPVER=4.0 # 3.50 -# This means 'enable Windows 95 features' (in wxWindows and in the compiler). -WINVERSION=-DWINVER=0x0400 -D__GNUWIN32__ -endif - -# This is never used and should be expunged. -# CPU=i386 - -# Suffixes -OBJSUFF=o -SRCSUFF=cpp -LIBPREFIX=lib -LIBSUFF=a -EXESUFF=.exe -RESSUFF=res -RSCSUFF=rsc - -# Warnings -WARN = -Wall - -# build wxbase/wxMSW -ifeq ($(wxUSE_GUI),1) - TOOLKIT=msw - GUI = -else - TOOLKIT=base - GUI = -DwxUSE_GUI=0 -endif - -ifeq ($(FINAL),1) - OPT = -O2 -fno-rtti -fno-exceptions -else - OPT = -fno-rtti -fno-exceptions -endif - -# Options for ar archiver -AROPTIONS = ruv -AR = $(CROSS)ar -RANLIB = $(CROSS)ranlib - -# Extra compiler libraries -COMPLIBS= - -# Compiler or system-specific include paths -COMPPATHS= - -########################## Directories ############################### - -OLELIBS=-lole32 -loleaut32 -luuid -BASELIBS=-lstdc++ -lgcc -lodbc32 -lwsock32 -ifeq ($(wxUSE_GUI),1) - WINLIBS= $(BASELIBS) \ - -lwinspool -lwinmm -lshell32 \ - -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \ - -lodbc32 -lwsock32 -lopengl32 -lglu32 $(OLELIBS) # -loldnames -else - WINLIBS=$(BASELIBS) -endif - -#WINLIBS=-lstdc++ -lgcc \ -# -lwinspool -lwinmm -lshell32 \ -# -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lwsock32 # -loldnames - -# Shouldn't need to change these... -WXSRC=$(WXDIR)/src/msw -WXINC=$(WXDIR)/include -WXBASESRC=$(WXDIR)/src/common - -#ifeq ($(MINGW32),1) -#INC = -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) -#else -INC = -I$(WXDIR)/lib/$(TOOLKIT)$(INCEXT) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff $(EXTRAINC) $(COMPPATHS) $(GNUWIN32EXTRA) -#endif - -RCLFLAGS=-cpp "cpp -lang-c++ $(OBSOLETE_DEFINES) -DRCL_INVOKED -I$(WXWIN)/include" - -ifdef WXUSINGDLL - # png, jpeg, etc are exported from wx dll, so skip and save on link time. - LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS) -else - LIBS = $(EXTRALIBS) $(WXLIB) -lregex$(MIN_SUFFIX) -lpng$(MIN_SUFFIX) -ljpeg$(MIN_SUFFIX) -lzlib$(MIN_SUFFIX) -ltiff$(MIN_SUFFIX) $(WINLIBS) $(COMPLIBS) -endif - -WINFLAGS = $(OBSOLETE_DEFINES) $(WINVERSION) - -#for windows 95 -XINCLUDE=$(WINFLAGS) -XLIB=$(LIBS) -LDLIBS = $(LIBS) - -# Directory for object files (don't change) -# OBJDIR = objects$(GUISUFFIX) -OBJDIR = . - -ifeq ($(FINAL),1) - DEBEXT= -else - DEBEXT=d -endif - -ifeq ($(UNICODE),1) - UNIEXT=u -else - UNIEXT= -endif - -ifeq ($(WXMAKINGDLL)$(WXUSINGDLL),) - INCEXT=$(UNIEXT)$(DEBEXT) -else - INCEXT=dll$(UNIEXT)$(DEBEXT) -endif - -WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(UNIEXT)$(DEBEXT).$(LIBSUFF) - -ifdef WXMAKINGDLL - EXTRADLLFLAGS = -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1 - WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).$(LIBSUFF) -endif - -ifdef WXUSINGDLL - EXTRADLLFLAGS = -DWXUSINGDLL=1 - WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx$(TOOLKIT)$(WXVERSION)$(UNIEXT)$(DEBEXT)$(MIN_SUFFIX).$(LIBSUFF) -endif - - -ifeq ($(wxUSE_GUI),1) - WINDOWSLDFLAGS=-Wl,--subsystem,windows - WINDOWSLDLIBS=-mwindows -endif - -# Note: WIN32_LEAN_AND_MEAN is defined only for C and not for C++ compiles. -# Defining this macro means that a great deal of less commonly used stuff -# is ignored in the windows headers, resulting in faster compiles. It can't -# be used with some C++ source files. It just so happens that it can be -# used with all C source files. - -CFLAGS = -DWIN32_LEAN_AND_MEAN - -WXLIBDIRS = -L$(WXDIR)/lib -L$(WXDIR)/contrib/lib - -# You shouldn't need to change these flags, which are merely composed of -# the options selected above. You can add more flags by specifying them on -# the make command line, e.g. -# make CXXFLAGS='-O3 -march=i686' -f makefile.g95 -# The gnu make manual says -# 'Users expect to be able to specify CFLAGS freely themselves' -# That was unsafe with older versions of this makefile, but now it works. -# -# C preprocessor flags -# Some makefiles pass extra flags in $(EXTRACPPFLAGS); although earlier -# versions of this file used CPPFLAGS as C++ compiler flags (instead of -# as C preprocessor flags), it is OK to add them to the preprocessor -# flags, which are always used for C++ compiles. Because other makefiles -# use this method to override these flags, they are added after $(CPPFLAGS), -# which would normally come last. -ALL_CPPFLAGS = $(XINCLUDE) $(INC) $(CPPFLAGS) $(EXTRACPPFLAGS) -# C and C++ compiler flags for compatibility with old gcc versions -REQUIRED_GCC_FLAGS = $(_STRUCT_RETURN_WORKAROUND) $(_THUNK_WORKAROUND) -# C++ compiler flags -ALL_CXXFLAGS = $(COMMON_FLAGS) $(REQUIRED_GCC_FLAGS) $(UNICODE_OPT) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRADLLFLAGS) $(CXXFLAGS) -# C compiler flags -ALL_CFLAGS = $(COMMON_FLAGS) $(REQUIRED_GCC_FLAGS) $(UNICODE_OPT) $(OPTIONS) $(GUI) $(DEBUGFLAGS) $(WARN) $(OPT) $(EXTRADLLFLAGS) $(CFLAGS) -# Linker flags -ALL_LDFLAGS = $(COMMON_FLAGS) $(WINDOWSLDFLAGS) $(WINDOWSLDLIBS) $(WXLIBDIRS) $(EXTRALDFLAGS) $(LDFLAGS) -# under Cygwin, Dlls must not be linked with subsystem=windows -ALL_LDFLAGS_DLL = $(COMMON_FLAGS) $(WINDOWSLDLIBS) $(WXLIBDIRS) $(EXTRALDFLAGS) $(LDFLAGS) - -.SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .cxx .cc .c - -.c.o: - $(CC) -c $(ALL_CPPFLAGS) $(ALL_CFLAGS) -o $@ $*.c - -.cc.o: - $(CXX) -c $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) -o $@ $*.cc - -.cxx.o: - $(CXX) -c $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) -o $@ $*.cxx - -# This '.cpp.o' rule is apparently written this way because -# the 'tmake' file g95.t expects it. -.$(SRCSUFF).$(OBJSUFF): - $(CXX) -c $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) -o $@ $*.$(SRCSUFF) diff --git a/src/makelib.b32 b/src/makelib.b32 deleted file mode 100644 index 1ebba24158..0000000000 --- a/src/makelib.b32 +++ /dev/null @@ -1,32 +0,0 @@ -# -# File: makelib.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Include file for libraries. Set LIBTARGET and OBJECTS -# before including this file. - - -lib: $(LIBTARGET) - -$(LIBTARGET): $(OBJECTS) - -if exist $(LIBTARGET) $(RM) $(LIBTARGET) - echo making $(LIBTARGET) - tlib "$(LIBTARGET)" /P512 @&&! -+$(OBJECTS:.obj =.obj +) -! - -clean: -## -if exist $(OBJ_PATH)\*.obj $(RM) $(OBJ_PATH)\*.obj - -if exist *.res $(RM) *.res - -if exist *.map $(RM) *.map - -if exist *.rws $(RM) *.rws - -if exist $(LIBTARGET) $(RM) $(LIBTARGET) - -.$(SRCSUFF).obj: - bcc32 $(CPPFLAGS) -c -n$(OBJ_PATH) {$< } - -.c.obj: - bcc32 $(CPPFLAGS) -P- -c -n$(OBJ_PATH) {$< } diff --git a/src/makelib.bcc b/src/makelib.bcc deleted file mode 100644 index 73705fb5be..0000000000 --- a/src/makelib.bcc +++ /dev/null @@ -1,37 +0,0 @@ -# -# File: makelib.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Include file for libraries. Set LIBTARGET and OBJECTS -# before including this file. - -# WXWIN and BCCDIR are set by parent make - -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\makebcc.env - -$(LIBTARGET): $(OBJECTS) - erase $(LIBTARGET) - tlib $(LIBTARGET) /P1024 @&&! --+$(OBJECTS:.obj =.obj -+) -! - -.$(SRCSUFF).obj: - bcc $(CPPFLAGS) -c {$< } - -.c.obj: - bcc $(CPPFLAGS) -P- -c {$< } - -clean: - -erase *.obj - -erase *.exe - -erase *.res - -erase *.map - -erase *.rws - -erase $(LIBTARGET) - - diff --git a/src/makelib.g95 b/src/makelib.g95 deleted file mode 100644 index 882d560429..0000000000 --- a/src/makelib.g95 +++ /dev/null @@ -1,24 +0,0 @@ -# -# File: makelib.g95 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: (c) Julian Smart, 1999 -# -# Include file for Cygwin/Mingw32 libraries - -# All common UNIX compiler flags and options are now in -# this central makefile. -include $(WXDIR)/src/makeg95.env - -all: $(LIBTARGET) $(EXTRATARGETS) - -$(LIBTARGET): $(OBJECTS) - ar $(AROPTIONS) $@ $(OBJECTS) - $(RANLIB) $@ - -clean: - -$(RM) $(OBJECTS) core *.rsc *.res - -cleanall: clean - -$(RM) $(LIBTARGET) diff --git a/src/makelib.vc b/src/makelib.vc deleted file mode 100644 index 2c4b8b9b5a..0000000000 --- a/src/makelib.vc +++ /dev/null @@ -1,49 +0,0 @@ -# -# 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 (hint, set an environment variable named WXWIN) -WXDIR = $(WXWIN) - -!include $(WXDIR)\src\makevc.env - -!if "$(RM)" == "" -RM= erase -!endif - -all: $(D) $(EXTRATARGETS) $(LIBTARGET) - -$(D) : - mkdir $(D) - -wx: - cd $(WXDIR)\src\msw - nmake -f makefile.vc FINAL=$(FINAL) - -wxclean: - cd $(WXDIR)\src\msw - nmake -f makefile.vc clean - -$(LIBTARGET): $(OBJECTS) - -$(RM) $(LIBTARGET) - $(implib) @<< --out:$(LIBTARGET) --machine:$(CPU) -$(OBJECTS) -<< - -clean: - -$(RM) $(LIBTARGET) - -$(RM) $(OBJECTS) - -$(RM) *.exe - -$(RM) *.res - -$(RM) *.map - -$(RM) *.sbr - -$(RM) *.pdb diff --git a/src/makemsc.env b/src/makemsc.env deleted file mode 100644 index b896b1852f..0000000000 --- a/src/makemsc.env +++ /dev/null @@ -1,72 +0,0 @@ -# -# File: makemsc.env -# Author: Julian Smart -# Created: 1993 -# Updated: -# Copyright: -# -# "%W% %G%" -# -# Include file for MS VC++ makefiles -# Arguments: -# -# FINAL=1 argument to nmake to build version with no debugging info. -# DLL=1 builds a library (wxdll.lib) suitable for creating DLLs. -# -# Set WXDIR to the wxWindows directory if env. variable WXWIN not set. -# From your specific makefile, set EXTRAFLAGS to add flags to CPPFLAGS, -# such as extra include directories or defines. - -WXDIR = $(WXWIN) -WXINC = $(WXDIR)\include - -WXLIB=$(WXDIR)\lib\wx1.lib $(WXDIR)\lib\wx2.lib $(WXDIR)\lib\wx3.lib $(WXDIR)\lib\wx4.lib $(WXDIR)\lib\wx5.lib - -# Suffixes -OBJSUFF=obj -SRCSUFF=cpp - -#INC=/I$(WXDIR)\include -INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg $(EXTRAINC) - -# Set this to nothing if using MS C++ 7 -ZOPTION=/Z7 - -!ifndef FINAL -FINAL=0 -!endif - -!ifndef DLL -DLL=0 -!endif - -OPTIONS= - -!if "$(FINAL)" == "0" -OPT = /Od /Gy -DEBUG_FLAGS= /Zi $(ZOPTION) -LINK_DEBUG_FLAGS=/CO -!else -OPT = /Od /Gy # Note: /Ox or /Os crash the compiler or samples -DEBUG_FLAGS= -LINK_DEBUG_FLAGS= -!endif - -LIBS=$(WXLIB) $(EXTRALIBS) oldnames libw llibcew commdlg ddeml shell mmsystem ole2 $(WXDIR)\lib\msvc15\ctl3dv2.lib - -!if "$(DLL)" == "0" -PCH=WX.PCH -PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) -CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WXMSW__ /D__WINDOWS__ $(PRECOMP) -CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WXMSW__ /D__WINDOWS__ -LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE -DUMMY=dummy -!else -PCH=WX.PCH -PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) -CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WXMSW__ /D__WINDOWS__$(PRECOMP) -CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WXMSW__ /D__WINDOWS__ -LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE -DUMMY=dummydll -!endif - diff --git a/src/makeprog.b32 b/src/makeprog.b32 deleted file mode 100644 index 59592513ea..0000000000 --- a/src/makeprog.b32 +++ /dev/null @@ -1,118 +0,0 @@ -# -# File: makeprog.b32 -# Author: Julian Smart -# Created: 1999 -# Updated: -# Copyright: -# -# Include file for samples and utilities. Set TARGET, OBJECTS and -# TARGETDEF (if you want to include a DEF file in the build) before -# including this file. - -# WXWIN set by parent make -# BCCDIR set in makeb32.env - -WXDIR = $(WXWIN) - -!ifndef EXEDIR -EXEDIR = BORL -!endif - -!include $(WXDIR)\src\makeb32.env - -!if "$(wxUSE_GUI)" == "0" -IMGLIBS= -!else -IMGLIBS= png_bc$(DEBUG_SUFFIX) jpeg_bc$(DEBUG_SUFFIX) tiff_bc$(DEBUG_SUFFIX) -!endif - -!if "$(FINAL)" == "0" -EX_LIBS=$(EXTRALIBS:.lib=_bcd.lib) -!else -EX_LIBS=$(EXTRALIBS:.lib=_bc.lib) -!endif - -!if "$(WXUSINGDLL)" == "1" -LIBS=$(WXLIB) $(EX_LIBS) cw32mti import32 ole2w32 regex_bc$(DEBUG_SUFFIX) zlib_bc$(DEBUG_SUFFIX) $(IMGLIBS) -!else -LIBS=$(WXLIB) $(EX_LIBS) cw32mt import32 ole2w32 regex_bc$(DEBUG_SUFFIX) zlib_bc$(DEBUG_SUFFIX) $(IMGLIBS) -!endif - -!if "$(wxUSE_ODBC)" == "1" -LIBS=$(LIBS) odbc32 -!endif - - -!if "$(wxUSE_GUI)" == "0" -LINKOUT = /ap -!else -LINKOUT = /aa -!endif - -!if "$(FINAL)" == "0" -#LINKFLAGS=/v /c /Tpe $(LNKCFG) $(EXTRALINKFLAGS) -LINKFLAGS=/v /c $(LINKOUT) -L"$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk" $(EXTRALINKFLAGS) -OPT = -Od -DEBUG_FLAGS= -v -!else -#LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS) -LINKFLAGS=$(LINKOUT) -L"$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk" $(EXTRALINKFLAGS) -OPT = -Od -DEBUG_FLAGS = -!endif - -CPPFLAGS=$(CPPFLAGS) $(DEBUG_FLAGS) $(OPT) - -!if "$(wxUSE_GUI)" == "0" -TARGETRES = -STARTUP = c0x32.obj -!else -TARGETRES = $(EXEDIR)\$(TARGET).res -STARTUP = c0w32.obj -!endif - -EXE_TARGET=$(EXEDIR)\$(TARGET) - -default : all - -maked: - -if not exist $(EXEDIR)\nul mkdir $(EXEDIR) - -wx: $(EXE_TARGET).exe $(EXTRATARGETS) - -all: maked wx - - -$(EXE_TARGET).exe: $(OBJECTS) $(TARGETDEF) $(TARGETRES) - $(LINK) $(LINKFLAGS) -j$(EXEDIR) @&&! -$(STARTUP) $(OBJECTS) -$(EXE_TARGET) -nul -$(LIBS) -$(TARGETDEF) -$(TARGETRES) -! - -.path.obj=$(EXEDIR) - -.$(SRCSUFF).obj: - bcc32 $(CPPFLAGS) -c -n$(EXEDIR) {$< } - -.c.obj: - bcc32 $(CPPFLAGS) -P- -c -n$(EXEDIR) {$< } - -!if "$(wxUSE_GUI)" != "0" -#make resources only with GUI apps -$(TARGETRES) : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc - brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include /i$(WXDIR)\contrib\include -fo$(EXEDIR)\$( - -# read version numbers -!include "version.mak" -WXVERSION=$(wxMAJOR_VERSION)$(wxMINOR_VERSION)$(wxRELEASE_NUMBER_IFUNSTABLE) - -!if "$(RM)" == "" -RM= erase -!endif - -# WIN95 means "all systems newer than Win95", i.e. Win9x and NT 4+ -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=4.0 -# This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0). -WINVERSION=-DWINVER=0x0400 -!endif - -# On Alpha machines, change to CPU=ALPHA -CPU=i386 - -# Suffixes -OBJSUFF=obj -SRCSUFF=cpp - -WAITFLAG=/w - -# If you set wxUSE_IOSTREAMH to 0, remove -# -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -#WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION) -DSTRICT -WINFLAGS=-c -W3 -nologo -DWIN32 -D_WINDOWS $(WINVERSION) -DSTRICT -WINLINKFLAGS=-nologo -machine:$(CPU) -subsystem:windows,$(APPVER) -BASELINKFLAGS=-nologo -machine:$(CPU) -subsystem:console,$(APPVER) -WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib \ - shell32.lib oldnames.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib \ - uuid.lib rpcrt4.lib advapi32.lib wsock32.lib \ - # libci.lib # libci.lib required for VC++ 4.2 - -# Set a WXWIN environment variable be the path 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 wx$(WXVERSION).lib -# -# App using wxWin DLL - Defined - wx$(WXVERSION).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" -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 - -!ifndef UNICODE -UNICODE=0 -!endif - -!ifndef MSLU -MSLU=0 -!endif - -!ifndef FINAL -FINAL=0 -!endif - -!ifndef DEBUGINFO -!if "$(FINAL)" == "0" -DEBUGINFO=1 -!else -DEBUGINFO=0 -!endif -!endif - -!ifndef DLL -DLL=0 -!endif - -# Set this to 1 if you don't want to use precompiled headers -!ifndef NOPCH -NOPCH=0 -!endif - -# This sets 'D' to a suitable directory name: [Base](Debug|Release|Hybrid)[Dll] -# for this kind of build, and WXLIBNAME to one of wx(msw|base)[u][d] (static), -# wx(msw|base)$(WXVERSION)[u][d] (DLL) - -!if "$(UNICODE)" == "1" -_WXLIB_SUFFIX=u -_WXINC_SUFFIX=u -_WXDIR_UNICODESUFFIX=Unicode -!endif - -!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" -_WXLIB_VERSION=$(WXVERSION) -_WXDIR_DLLSUFFIX=Dll -_WXINC_DLLSUFFIX=dll -!else -_WXLIB_VERSION= -_WXDIR_DLLSUFFIX= -_WXINC_DLLSUFFIX= -!endif - -!if "$(FINAL)" == "1" -_WXDIR_BUILD=Release -LIBEXT= -# no _WXDIR_SUFFIX -!else if "$(FINAL)" == "hybrid" -_WXDIR_BUILD=Hybrid -LIBEXT=h -!else -guilibsdll= oldnames.lib kernel32.lib \ - ws2_32.lib mswsock.lib advapi32.lib user32.lib \ - gdi32.lib comdlg32.lib winspool.lib -_WXDIR_BUILD=Debug -LIBEXT=d -!endif - -!if "$(wxUSE_GUI)" == "0" -_WXDIR_PREFIX=Base -_WXLIB_NAME=wxbase -_WXINC_BUILD=base -!else -_WXDIR_PREFIX= -_WXLIB_NAME=wxmsw -_WXINC_BUILD=msw -!endif - -!if "$(UNICODE)" == "1" -UNIFLAGS=-DUNICODE -D_UNICODE -DwxUSE_UNICODE=1 -!endif - -!if "$(wxUSE_GUI)" == "0" -UNIFLAGS=$(UNIFLAGS) -DwxUSE_GUI=0 -!endif - -!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" -D=$(D)DLL -INCEXT=dll$(INCEXT) -!endif - -D=$(_WXDIR_PREFIX)$(_WXDIR_BUILD)$(_WXDIR_UNICODESUFFIX)$(_WXDIR_DLLSUFFIX) -WXLIBNAME=$(_WXLIB_NAME)$(_WXLIB_VERSION)$(_WXLIB_SUFFIX)$(LIBEXT) -INCEXT=$(_WXINC_SUFFIX)$(LIBEXT) - -!if "$(NEW_WXLIBNAME)" != "" -WXLIBNAME=$(NEW_WXLIBNAME) -!endif - -#---------------------------------------------------------------------- -# MSLU == Microsoft Layer for Unicode -# See MSDN or the Platform SDK docs for details -!if "$(MSLU)" == "1" -MSLU_FLAGS=/nod:kernel32.lib /nod:advapi32.lib /nod:user32.lib /nod:gdi32.lib /nod:shell32.lib /nod:comdlg32.lib /nod:version.lib /nod:mpr.lib /nod:rasapi32.lib /nod:winmm.lib /nod:winspool.lib /nod:vfw32.lib /nod:secur32.lib /nod:oleacc.lib /nod:oledlg.lib /nod:sensapi.lib -MSLU_LIBS=$(MSLU_FLAGS) unicows.lib -!endif - -WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib - -INC=$(EXTRAINC) -I$(WXDIR)/lib/$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff - -!if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0" -LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib -!else -LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib -!endif - -OPTIONS= - -!if "$(DEBUGINFO)" == "0" - -!if "$(FINAL)" == "hybrid" -OPT = /Ox /Gy -!else -# /O1 - smallest code -# /O2 - fastest code -OPT = /O1 # /O2 # /Od -!endif - -LINK_DEBUG_FLAGS=/RELEASE - -!else -OPT = /Od /Gy /Zi -LINK_DEBUG_FLAGS=-debug:full -debugtype:cv -!endif - -!if "$(FINAL)" == "0" -# ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated -DEBUG_FLAGS= /D__WXDEBUG__ # /DDEBUG=1 # /FR -_CRTFLAG=/MDd - -!else if "$(FINAL)" == "hybrid" -DEBUG_FLAGS= /D__WXDEBUG__ /D__NO_VC_CRTDBG__ -_CRTFLAG=/MD - -!else -DEBUG_FLAGS= -_CRTFLAG=/MD - -!endif - - -!if "$(CRTFLAG)" == "" -CRTFLAG=$(_CRTFLAG) -!endif - -!if "$(NOPCH)" == "1" - -PCH= -PRECOMP= -MAKEPRECOMP= - -!else - -!if "$(wxUSE_GUI)" == "0" -PCH=wxBase.pch -!else -PCH=wxWindows.pch -!endif - -PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\$D\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb -MAKEPRECOMP=/YcWX/WXPREC.H - -!endif - -!if "$(DLL)" == "0" - -CPPFLAGS=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS) -# If you don't include wxprec.h, use CPPFLAGS2 -CPPFLAGS2=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS) - -!if "$(wxUSE_GUI)" == "0" -LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS) -!else -LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -!endif - -DUMMY=dummy - -!else - -CPPFLAGS= $(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDLL -CPPFLAGS2=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(EXTRAFLAGS) $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDLL - -!if "$(wxUSE_GUI)" == "0" -LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS) -dll -!else -LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -dll -!endif - -!if "$(WXMAKINGDLL)" == "1" -DUMMY=dummydll -!else -DUMMY=dummy -!endif - -!endif - -DUMMYOBJ=$(WXDIR)\$D\$(DUMMY).obj - -.c.obj: - cl @<< -$(CPPFLAGS2) /Fo$@ /c $< -<< - -.cpp.obj: - cl @<< -$(CPPFLAGS2) /Fo$@ /c $< -<< - -#use CPPFLAGS2 so as not to use precompiled headers -{}.c{$D}.obj: - cl @<< -$(CPPFLAGS2) /Fo$@ /c $< -<< - -{}.cpp{$D}.obj: - cl @<< -$(CPPFLAGS) /Fo$@ /c /Tp $< -<< - diff --git a/src/ntwxwin.mak b/src/ntwxwin.mak deleted file mode 100644 index 28cbb18dcc..0000000000 --- a/src/ntwxwin.mak +++ /dev/null @@ -1,3 +0,0 @@ -# Compatibility only: use makevc.env - -!include $(WXWIN)\src\makevc.env diff --git a/src/version.mak b/src/version.mak deleted file mode 100644 index 52c0ba466b..0000000000 --- a/src/version.mak +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################## -# Name: src/version.mak -# Purpose: file defining wxWindows version used by all other makefiles -# Author: Vadim Zeitlin -# Modified by: -# Created: 25.02.03 -# RCS-ID: $Id$ -# Copyright: (c) 2003 Vadim Zeitlin -# Licence: wxWindows license -############################################################################## - -wxMAJOR_VERSION=2 -wxMINOR_VERSION=5 -wxRELEASE_NUMBER=1 - -# release number if used in the DLL file names only for the unstable branch as -# for the stable branches the micro releases are supposed to be backwards -# compatible and so should have the same name or otherwise it would be -# impossible to use them without recompiling the applications (which is the -# whole goal of keeping them backwards compatible in the first place) -# -# as 2.5 is an unstable branch, wxRELEASE_NUMBER_IFUNSTABLE should be set -# (but when we go to 2.6, it should become empty) -wxRELEASE_NUMBER_IFUNSTABLE=$(wxRELEASE_NUMBER) -- 2.47.2