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
@@ -1,65 +1,65 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
include ../../build/msw/config.gcc
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Do not modify the rest of this file!
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
### Variables: ###
|
||||
|
||||
MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
|
||||
LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
|
||||
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
|
||||
LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
|
||||
TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \
|
||||
UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
|
||||
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
|
||||
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
|
||||
USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \
|
||||
USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \
|
||||
USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
|
||||
USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
|
||||
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
|
||||
USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
|
||||
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
|
||||
WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
|
||||
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
|
||||
RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" \
|
||||
WINDRES="$(WINDRES)"
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: cube isosurf penguin
|
||||
|
||||
clean:
|
||||
-if exist .\*.o del .\*.o
|
||||
-if exist .\*.d del .\*.d
|
||||
$(MAKE) -C cube -f makefile.gcc $(MAKEARGS) clean
|
||||
$(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) clean
|
||||
$(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) clean
|
||||
|
||||
cube:
|
||||
$(MAKE) -C cube -f makefile.gcc $(MAKEARGS) all
|
||||
|
||||
isosurf:
|
||||
$(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) all
|
||||
|
||||
penguin:
|
||||
$(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) all
|
||||
|
||||
.PHONY: all clean cube isosurf penguin
|
||||
|
||||
|
||||
SHELL := $(COMSPEC)
|
||||
|
||||
# Dependencies tracking:
|
||||
-include ./*.d
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.9 (http://www.bakefile.org)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
include ../../build/msw/config.gcc
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Do not modify the rest of this file!
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
### Variables: ###
|
||||
|
||||
MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
|
||||
LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
|
||||
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
|
||||
LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
|
||||
TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \
|
||||
UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
|
||||
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
|
||||
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
|
||||
USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \
|
||||
USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \
|
||||
USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
|
||||
USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
|
||||
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
|
||||
USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
|
||||
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
|
||||
WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
|
||||
CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
|
||||
RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" \
|
||||
WINDRES="$(WINDRES)"
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: cube isosurf penguin
|
||||
|
||||
clean:
|
||||
-if exist .\*.o del .\*.o
|
||||
-if exist .\*.d del .\*.d
|
||||
$(MAKE) -C cube -f makefile.gcc $(MAKEARGS) clean
|
||||
$(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) clean
|
||||
$(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) clean
|
||||
|
||||
cube:
|
||||
$(MAKE) -C cube -f makefile.gcc $(MAKEARGS) all
|
||||
|
||||
isosurf:
|
||||
$(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) all
|
||||
|
||||
penguin:
|
||||
$(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) all
|
||||
|
||||
.PHONY: all clean cube isosurf penguin
|
||||
|
||||
|
||||
SHELL := $(COMSPEC)
|
||||
|
||||
# Dependencies tracking:
|
||||
-include ./*.d
|
||||
|
||||
Reference in New Issue
Block a user