Skip to content

Commit

Permalink
Some more text files now have the eol-style property set to native.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lego3 committed Nov 24, 2012
1 parent 50a446b commit 4eeb05f
Show file tree
Hide file tree
Showing 9 changed files with 182,460 additions and 182,477 deletions.
17 changes: 0 additions & 17 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
* text=auto !eol
AnimView/AnimView.ico -text
AnimView/AnimView.rc -text
AnimView/CMakeLists.txt -text
AnimView/VSPR-0.xml -text
AnimView/tinystr.cpp -text
AnimView/tinystr.h -text
AnimView/tinyxml.cpp -text
AnimView/tinyxml.h -text
AnimView/tinyxmlerror.cpp -text
AnimView/tinyxmlparser.cpp -text
CorsixTH/Bitmap/aux_ui.dat -text svneol=unset#unset
CorsixTH/Bitmap/aux_ui.spec -text
CorsixTH/Bitmap/aux_ui.tab -text
Expand Down Expand Up @@ -70,18 +62,13 @@ CorsixTH/Levels/original07.level -text
CorsixTH/Levels/original11.level -text
CorsixTH/Levels/original12.level -text
CorsixTH/Lua/dialogs/fullscreen/graphs.lua -text
CorsixTH/Lua/entities/vip.lua -text
CorsixTH/Original_Logo.svg -text
CorsixTH/Original_Logo_Text.svg -text
CorsixTH/SDLMain/CMakeLists.txt -text
CorsixTH/SDLMain/SDLMain.m -text
CorsixTH/__MACOSX/SDLMain/._SDLMain.m -text
CorsixTH/changelog.txt -text
DebianPackage/control -text
DebianPackage/debian-binary -text
DebianPackage/postinst -text
DebianPackage/prerm -text
DebianPackage/readme.txt -text
DebianPackage/usr/games/CorsixTH -text
DebianPackage/usr/share/applications/CorsixTH.desktop -text
DebianPackage/usr/share/applications/MapEdit.desktop -text
Expand All @@ -101,19 +88,15 @@ LDocGen/templates/page.htlua -text
LFS/lfs.def -text
LPEG/lpeg-128.gif -text
LPEG/lpeg.html -text
MapEdit/CMakeLists.txt -text
MapEdit/MapEdit.ico -text
MapEdit/MapEdit.rc -text
TestProcedure/Saves/issue[!!-~]1119.sav -text
TestProcedure/Saves/test-save-beta8.sav -text
TestProcedure/procedure.txt -text
WindowsInstaller/LanguageStrings.nsh -text
WindowsInstaller/OptionsPage.ini -text
WindowsInstaller/ReplaceInFile.nsh -text
WindowsInstaller/StrRep.nsh -text
WindowsInstaller/Win32Script.nsi -text
WindowsInstaller/config_template.txt -text
WindowsInstaller/readme.txt -text
WindowsInstaller/welcome.bmp -text
agg/authors -text
agg/copying -text
Expand Down
198 changes: 99 additions & 99 deletions AnimView/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,99 +1,99 @@
# Project Declaration
PROJECT(AnimView)

# Generate source files list
# Note: do not use generic includes (*.cpp and such) this will break things with cmake
SET(animview_source_files
app.cpp
frmMain.cpp
frmSprites.cpp
rnc.cpp
th.cpp
tinystr.cpp
tinyxml.cpp
tinyxmlerror.cpp
tinyxmlparser.cpp
app.h
backdrop.h
frmMain.h
frmSprites.h
th.h
tinystr.h
tinyxml.h
AnimView.rc
)

# Declaration of the executable
IF(APPLE)

set(corsixth_icon_file ${CMAKE_SOURCE_DIR}/CorsixTH/Icon.icns)
set_source_files_properties(
${corsixth_icon_file}
PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
set(MACOSX_BUNDLE_ICON_FILE Icon.icns)

add_executable(
AnimView
MACOSX_BUNDLE
${animview_source_files}
${corsixth_icon_file}
)

set_target_properties(AnimView PROPERTIES LINK_FLAGS_MINSIZEREL "-dead_strip")
ELSE()
add_executable(
AnimView
WIN32 # This prevents the dos console showing up
${animview_source_files}
)
ENDIF()

# Finding libraries

# Find WxWidgets
SET(wxWidgets_USE_LIBS core base) # optionally: more than wx std libs
FIND_PACKAGE(wxWidgets REQUIRED)
IF(wxWidgets_FOUND)
LINK_LIBRARIES(${wxWidgets_LIBRARIES})
INCLUDE_DIRECTORIES(${wxWidgets_INCLUDE_DIRS})
INCLUDE(${wxWidgets_USE_FILE})
TARGET_LINK_LIBRARIES(AnimView ${wxWidgets_LIBRARIES})
message(" wxWidgets found")
ELSE(wxWidgets_FOUND)
message(FATAL_ERROR "error: wxWdigets library not found, it is required to build")
message("Make sure the path is correctly defined or set the environment variable WXWIN to the correct location")
ENDIF(wxWidgets_FOUND)

# Basic platform dependant stuff
IF(UNIX)
IF(APPLE)
# fruit goes here
ELSE(APPLE)
# regular unix/linux
ENDIF(APPLE)
ELSE(UNIX)
IF(WIN32)
# Win32 specific
IF(MSVC)
# We want to bind against the very latest versions of the MSVC runtimes
add_definitions(/D "_BIND_TO_CURRENT_VCLIBS_VERSION=1")
ELSE(MSVC)
IF(MSYS)
# MSYS stuff
ELSE(MSYS)
# What's left? MINGW? CYGWIN? BORLAND?
ENDIF(MSYS)
ENDIF(MSVC)
ELSE(WIN32)
# other OS (not UNIX, not 32/64 bit Windows)
ENDIF(WIN32)
ENDIF(UNIX)

IF(APPLE)
install(TARGETS AnimView BUNDLE DESTINATION .)
ELSE()
install(TARGETS AnimView RUNTIME DESTINATION AnimView)
install(FILES LICENSE.txt DESTINATION AnimView )
ENDIF()
# Project Declaration
PROJECT(AnimView)

# Generate source files list
# Note: do not use generic includes (*.cpp and such) this will break things with cmake
SET(animview_source_files
app.cpp
frmMain.cpp
frmSprites.cpp
rnc.cpp
th.cpp
tinystr.cpp
tinyxml.cpp
tinyxmlerror.cpp
tinyxmlparser.cpp
app.h
backdrop.h
frmMain.h
frmSprites.h
th.h
tinystr.h
tinyxml.h
AnimView.rc
)

# Declaration of the executable
IF(APPLE)

set(corsixth_icon_file ${CMAKE_SOURCE_DIR}/CorsixTH/Icon.icns)
set_source_files_properties(
${corsixth_icon_file}
PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
set(MACOSX_BUNDLE_ICON_FILE Icon.icns)

add_executable(
AnimView
MACOSX_BUNDLE
${animview_source_files}
${corsixth_icon_file}
)

set_target_properties(AnimView PROPERTIES LINK_FLAGS_MINSIZEREL "-dead_strip")
ELSE()
add_executable(
AnimView
WIN32 # This prevents the dos console showing up
${animview_source_files}
)
ENDIF()

# Finding libraries

# Find WxWidgets
SET(wxWidgets_USE_LIBS core base) # optionally: more than wx std libs
FIND_PACKAGE(wxWidgets REQUIRED)
IF(wxWidgets_FOUND)
LINK_LIBRARIES(${wxWidgets_LIBRARIES})
INCLUDE_DIRECTORIES(${wxWidgets_INCLUDE_DIRS})
INCLUDE(${wxWidgets_USE_FILE})
TARGET_LINK_LIBRARIES(AnimView ${wxWidgets_LIBRARIES})
message(" wxWidgets found")
ELSE(wxWidgets_FOUND)
message(FATAL_ERROR "error: wxWdigets library not found, it is required to build")
message("Make sure the path is correctly defined or set the environment variable WXWIN to the correct location")
ENDIF(wxWidgets_FOUND)

# Basic platform dependant stuff
IF(UNIX)
IF(APPLE)
# fruit goes here
ELSE(APPLE)
# regular unix/linux
ENDIF(APPLE)
ELSE(UNIX)
IF(WIN32)
# Win32 specific
IF(MSVC)
# We want to bind against the very latest versions of the MSVC runtimes
add_definitions(/D "_BIND_TO_CURRENT_VCLIBS_VERSION=1")
ELSE(MSVC)
IF(MSYS)
# MSYS stuff
ELSE(MSYS)
# What's left? MINGW? CYGWIN? BORLAND?
ENDIF(MSYS)
ENDIF(MSVC)
ELSE(WIN32)
# other OS (not UNIX, not 32/64 bit Windows)
ENDIF(WIN32)
ENDIF(UNIX)

IF(APPLE)
install(TARGETS AnimView BUNDLE DESTINATION .)
ELSE()
install(TARGETS AnimView RUNTIME DESTINATION AnimView)
install(FILES LICENSE.txt DESTINATION AnimView )
ENDIF()
Loading

0 comments on commit 4eeb05f

Please sign in to comment.