Having CRLF files in the repository with eol=crlf breaks just about
everything, e.g. any rebase/merge involving these files would fail.
Try to fix this by making sure the files use LF in the repository and CRLF is
only used in the working copy.
(analogous to commit c3e5751c36
)
262 lines
8.0 KiB
Plaintext
262 lines
8.0 KiB
Plaintext
# =========================================================================
|
|
# This makefile was generated by
|
|
# Bakefile 0.2.9 (http://www.bakefile.org)
|
|
# Do not modify, all changes will be overwritten!
|
|
# =========================================================================
|
|
|
|
.autodepend
|
|
|
|
!ifndef BCCDIR
|
|
!ifndef MAKEDIR
|
|
!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
|
|
!endif
|
|
BCCDIR = $(MAKEDIR)\..
|
|
!endif
|
|
|
|
!include ../../build/msw/config.bcc
|
|
|
|
# -------------------------------------------------------------------------
|
|
# Do not modify the rest of this file!
|
|
# -------------------------------------------------------------------------
|
|
|
|
### Variables: ###
|
|
|
|
WX_RELEASE_NODOT = 30
|
|
COMPILER_PREFIX = bcc
|
|
OBJS = \
|
|
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
|
LIBDIRNAME = \
|
|
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
|
|
SETUPHDIR = \
|
|
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
|
|
IMAGE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
|
|
$(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
|
|
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
|
|
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
|
|
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
|
|
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
|
|
-DNOPCH $(CPPFLAGS) $(CXXFLAGS)
|
|
IMAGE_OBJECTS = \
|
|
$(OBJS)\image_image.obj \
|
|
$(OBJS)\image_canvas.obj
|
|
|
|
### Conditionally set variables: ###
|
|
|
|
!if "$(USE_GUI)" == "0"
|
|
PORTNAME = base
|
|
!endif
|
|
!if "$(USE_GUI)" == "1"
|
|
PORTNAME = msw$(TOOLKIT_VERSION)
|
|
!endif
|
|
!if "$(OFFICIAL_BUILD)" == "1"
|
|
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
|
|
!endif
|
|
!if "$(BUILD)" == "debug"
|
|
WXDEBUGFLAG = d
|
|
!endif
|
|
!if "$(UNICODE)" == "1"
|
|
WXUNICODEFLAG = u
|
|
!endif
|
|
!if "$(WXUNIV)" == "1"
|
|
WXUNIVNAME = univ
|
|
!endif
|
|
!if "$(SHARED)" == "1"
|
|
WXDLLFLAG = dll
|
|
!endif
|
|
!if "$(SHARED)" == "0"
|
|
LIBTYPE_SUFFIX = lib
|
|
!endif
|
|
!if "$(SHARED)" == "1"
|
|
LIBTYPE_SUFFIX = dll
|
|
!endif
|
|
!if "$(MONOLITHIC)" == "0"
|
|
EXTRALIBS_FOR_BASE =
|
|
!endif
|
|
!if "$(MONOLITHIC)" == "1"
|
|
EXTRALIBS_FOR_BASE =
|
|
!endif
|
|
!if "$(BUILD)" == "debug"
|
|
__OPTIMIZEFLAG_2 = -Od
|
|
!endif
|
|
!if "$(BUILD)" == "release"
|
|
__OPTIMIZEFLAG_2 = -O2
|
|
!endif
|
|
!if "$(USE_THREADS)" == "0"
|
|
__THREADSFLAG_5 =
|
|
!endif
|
|
!if "$(USE_THREADS)" == "1"
|
|
__THREADSFLAG_5 = mt
|
|
!endif
|
|
!if "$(USE_THREADS)" == "0"
|
|
__THREADSFLAG_6 =
|
|
!endif
|
|
!if "$(USE_THREADS)" == "1"
|
|
__THREADSFLAG_6 = -tWM
|
|
!endif
|
|
!if "$(RUNTIME_LIBS)" == "dynamic"
|
|
__RUNTIME_LIBS_7 = -tWR
|
|
!endif
|
|
!if "$(RUNTIME_LIBS)" == "static"
|
|
__RUNTIME_LIBS_7 =
|
|
!endif
|
|
!if "$(RUNTIME_LIBS)" == "dynamic"
|
|
__RUNTIME_LIBS_8 = i
|
|
!endif
|
|
!if "$(RUNTIME_LIBS)" == "static"
|
|
__RUNTIME_LIBS_8 =
|
|
!endif
|
|
!if "$(WXUNIV)" == "1"
|
|
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
|
|
!endif
|
|
!if "$(WXUNIV)" == "1"
|
|
__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
|
|
!endif
|
|
!if "$(DEBUG_FLAG)" == "0"
|
|
__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
|
|
!endif
|
|
!if "$(DEBUG_FLAG)" == "0"
|
|
__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
|
|
!endif
|
|
!if "$(BUILD)" == "release"
|
|
__NDEBUG_DEFINE_p = -DNDEBUG
|
|
!endif
|
|
!if "$(BUILD)" == "release"
|
|
__NDEBUG_DEFINE_p_1 = -dNDEBUG
|
|
!endif
|
|
!if "$(USE_EXCEPTIONS)" == "0"
|
|
__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
|
|
!endif
|
|
!if "$(USE_EXCEPTIONS)" == "0"
|
|
__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
|
|
!endif
|
|
!if "$(USE_RTTI)" == "0"
|
|
__RTTI_DEFINE_p = -DwxNO_RTTI
|
|
!endif
|
|
!if "$(USE_RTTI)" == "0"
|
|
__RTTI_DEFINE_p_1 = -dwxNO_RTTI
|
|
!endif
|
|
!if "$(USE_THREADS)" == "0"
|
|
__THREAD_DEFINE_p = -DwxNO_THREADS
|
|
!endif
|
|
!if "$(USE_THREADS)" == "0"
|
|
__THREAD_DEFINE_p_1 = -dwxNO_THREADS
|
|
!endif
|
|
!if "$(UNICODE)" == "0"
|
|
__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
|
|
!endif
|
|
!if "$(UNICODE)" == "1"
|
|
__UNICODE_DEFINE_p = -D_UNICODE
|
|
!endif
|
|
!if "$(UNICODE)" == "0"
|
|
__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
|
|
!endif
|
|
!if "$(UNICODE)" == "1"
|
|
__UNICODE_DEFINE_p_1 = -d_UNICODE
|
|
!endif
|
|
!if "$(MSLU)" == "1"
|
|
__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
|
|
!endif
|
|
!if "$(MSLU)" == "1"
|
|
__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
|
|
!endif
|
|
!if "$(USE_CAIRO)" == "1"
|
|
____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
|
|
!endif
|
|
!if "$(USE_CAIRO)" == "1"
|
|
____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo
|
|
!endif
|
|
!if "$(SHARED)" == "1"
|
|
__DLLFLAG_p = -DWXUSINGDLL
|
|
!endif
|
|
!if "$(SHARED)" == "1"
|
|
__DLLFLAG_p_1 = -dWXUSINGDLL
|
|
!endif
|
|
!if "$(MONOLITHIC)" == "0"
|
|
__WXLIB_CORE_p = \
|
|
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
|
|
!endif
|
|
!if "$(MONOLITHIC)" == "0"
|
|
__WXLIB_BASE_p = \
|
|
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
|
|
!endif
|
|
!if "$(MONOLITHIC)" == "1"
|
|
__WXLIB_MONO_p = \
|
|
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
|
|
!endif
|
|
!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"
|
|
__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib
|
|
!endif
|
|
!if "$(USE_GUI)" == "1"
|
|
__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
|
|
!endif
|
|
!if "$(USE_GUI)" == "1"
|
|
__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
|
|
!endif
|
|
!if "$(USE_GUI)" == "1"
|
|
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
|
|
!endif
|
|
!if "$(MSLU)" == "1"
|
|
__UNICOWS_LIB_p = unicows.lib
|
|
!endif
|
|
!if "$(USE_CAIRO)" == "1"
|
|
__CAIRO_LIB_p = cairo.lib
|
|
!endif
|
|
!if "$(USE_CAIRO)" == "1"
|
|
____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
|
|
!endif
|
|
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
|
|
__DEBUGINFO = -v
|
|
!endif
|
|
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
|
|
__DEBUGINFO = -v-
|
|
!endif
|
|
!if "$(DEBUG_INFO)" == "0"
|
|
__DEBUGINFO = -v-
|
|
!endif
|
|
!if "$(DEBUG_INFO)" == "1"
|
|
__DEBUGINFO = -v
|
|
!endif
|
|
|
|
|
|
all: $(OBJS)
|
|
$(OBJS):
|
|
-if not exist $(OBJS) mkdir $(OBJS)
|
|
|
|
### Targets: ###
|
|
|
|
all: $(OBJS)\image.exe data
|
|
|
|
clean:
|
|
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
|
|
-if exist $(OBJS)\*.res del $(OBJS)\*.res
|
|
-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
|
|
-if exist $(OBJS)\image.exe del $(OBJS)\image.exe
|
|
-if exist $(OBJS)\image.tds del $(OBJS)\image.tds
|
|
-if exist $(OBJS)\image.ilc del $(OBJS)\image.ilc
|
|
-if exist $(OBJS)\image.ild del $(OBJS)\image.ild
|
|
-if exist $(OBJS)\image.ilf del $(OBJS)\image.ilf
|
|
-if exist $(OBJS)\image.ils del $(OBJS)\image.ils
|
|
|
|
$(OBJS)\image.exe: $(IMAGE_OBJECTS) $(OBJS)\image_image.res
|
|
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
|
|
c0w32.obj $(IMAGE_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\image_image.res
|
|
|
|
|
|
|
data:
|
|
if not exist $(OBJS) mkdir $(OBJS)
|
|
for %f in (horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm horse.tif horse.tga horse.xpm horse.cur horse.ico horse3.ani smile.xbm toucan.png cmyk.jpg cursor.png) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
|
|
|
|
$(OBJS)\image_image.obj: .\image.cpp
|
|
$(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp
|
|
|
|
$(OBJS)\image_canvas.obj: .\canvas.cpp
|
|
$(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp
|
|
|
|
$(OBJS)\image_image.res: .\image.rc
|
|
<<<<<<< HEAD
|
|
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\image.rc
|
|
=======
|
|
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\image.rc
|
|
>>>>>>> cbd92ce... Fix resource compiler include path for Borland.
|
|
|