Convert all CRLF files to use LF to fix git confusion.

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)
This commit is contained in:
Václav Slavík
2016-04-07 19:06:23 +02:00
parent 59078ab545
commit a7644e7b05
660 changed files with 407951 additions and 407951 deletions

View File

@@ -1,84 +1,84 @@
# =========================================================================
# 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: ###
MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
-DCPP="$(CPP)" -DSHARED="$(SHARED)" -DTOOLKIT_VERSION="$(TOOLKIT_VERSION)" \
-DWXUNIV="$(WXUNIV)" -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" \
-DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \
-DDEBUG_FLAG="$(DEBUG_FLAG)" -DMONOLITHIC="$(MONOLITHIC)" \
-DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" \
-DUSE_WEBVIEW="$(USE_WEBVIEW)" -DUSE_MEDIA="$(USE_MEDIA)" \
-DUSE_XRC="$(USE_XRC)" -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \
-DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
-DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
-DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
-DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
### Conditionally set variables: ###
### Targets: ###
all: cube isosurf penguin
clean:
-if exist .\*.obj del .\*.obj
-if exist .\*.res del .\*.res
-if exist .\*.csm del .\*.csm
@echo cd cube >cube.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>cube.bat
call cube.bat
@del cube.bat
@echo cd isosurf >isosurf.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>isosurf.bat
call isosurf.bat
@del isosurf.bat
@echo cd penguin >penguin.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>penguin.bat
call penguin.bat
@del penguin.bat
cube:
@echo cd cube >cube.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>cube.bat
call cube.bat
@del cube.bat
isosurf:
@echo cd isosurf >isosurf.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>isosurf.bat
call isosurf.bat
@del isosurf.bat
penguin:
@echo cd penguin >penguin.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>penguin.bat
call penguin.bat
@del penguin.bat
# =========================================================================
# 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: ###
MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
-DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
-DCPP="$(CPP)" -DSHARED="$(SHARED)" -DTOOLKIT_VERSION="$(TOOLKIT_VERSION)" \
-DWXUNIV="$(WXUNIV)" -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" \
-DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \
-DDEBUG_FLAG="$(DEBUG_FLAG)" -DMONOLITHIC="$(MONOLITHIC)" \
-DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" \
-DUSE_WEBVIEW="$(USE_WEBVIEW)" -DUSE_MEDIA="$(USE_MEDIA)" \
-DUSE_XRC="$(USE_XRC)" -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \
-DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
-DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
-DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
-DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \
-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
-DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
-DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
-DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
### Conditionally set variables: ###
### Targets: ###
all: cube isosurf penguin
clean:
-if exist .\*.obj del .\*.obj
-if exist .\*.res del .\*.res
-if exist .\*.csm del .\*.csm
@echo cd cube >cube.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>cube.bat
call cube.bat
@del cube.bat
@echo cd isosurf >isosurf.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>isosurf.bat
call isosurf.bat
@del isosurf.bat
@echo cd penguin >penguin.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>penguin.bat
call penguin.bat
@del penguin.bat
cube:
@echo cd cube >cube.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>cube.bat
call cube.bat
@del cube.bat
isosurf:
@echo cd isosurf >isosurf.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>isosurf.bat
call isosurf.bat
@del isosurf.bat
penguin:
@echo cd penguin >penguin.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>penguin.bat
call penguin.bat
@del penguin.bat