Commit b1077010 authored by Rye Mutt's avatar Rye Mutt ūüćě
Browse files

ūüĒ• Line Ending Sadness

parent b64776e2
* text eol=lf
# Viewer Files
*.db2 binary
*.llm binary
*.sln text eol=crlf
*.vcproj text eol=crlf
*.vcxproj text eol=crlf
......@@ -9,5 +13,10 @@
*.tga binary
*.jpg binary
*.j2k binary
*.j2c binary
*.ico binary
*.icns binary
*.bmp binary
*.BMP binary
/indra/tools/manifests/compatibility.manifest text eol=crlf
\ No newline at end of file
project(deps)
include(FetchContent)
set(CMAKE_FOLDER "Third Party")
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
FetchContent_Declare(
Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v2.11.0
)
FetchContent_Declare(
fmt
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
GIT_TAG 6.1.2
)
FetchContent_Declare(
nlohmann_json
GIT_REPOSITORY https://github.com/nlohmann/json.git
GIT_TAG v3.7.3
)
FetchContent_Declare(
absl
GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/thirdparty/abseil-cpp.git
GIT_TAG 9b9a2536d1c212d792db9eb26b670b30397ee14c
)
# This is a hack because absl has dumb cmake
set(OLD_BUILD_TEST ${BUILD_TESTING})
set(BUILD_TESTING OFF)
FetchContent_MakeAvailable(absl)
set(BUILD_TESTING ${OLD_BUILD_TEST})
# Supress warnings inside abseil under MSVC
if(WINDOWS)
target_compile_options(absl_strings PRIVATE /wd4018)
target_compile_options(absl_str_format_internal PRIVATE /wd4018)
target_compile_options(absl_flags_usage_internal PRIVATE /wd4018)
endif()
if (BUILD_TESTING)
FetchContent_MakeAvailable(Catch2)
endif()
#Download the rest of the libraries
FetchContent_MakeAvailable(fmt)
# Typically you don't care so much for a third party library's tests to be
# run from your own project's code.
set(JSON_BuildTests OFF CACHE INTERNAL "")
# If you only include this third party in PRIVATE source files, you do not
# need to install it when your main project gets installed.
set(JSON_Install OFF CACHE INTERNAL "")
FetchContent_MakeAvailable(nlohmann_json)
unset(CMAKE_FOLDER)
unset(CMAKE_POSITION_INDEPENDENT_CODE)
project(deps)
include(FetchContent)
set(CMAKE_FOLDER "Third Party")
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
FetchContent_Declare(
Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v2.11.0
)
FetchContent_Declare(
fmt
GIT_REPOSITORY https://github.com/fmtlib/fmt.git
GIT_TAG 6.1.2
)
FetchContent_Declare(
nlohmann_json
GIT_REPOSITORY https://github.com/nlohmann/json.git
GIT_TAG v3.7.3
)
FetchContent_Declare(
absl
GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/thirdparty/abseil-cpp.git
GIT_TAG 9b9a2536d1c212d792db9eb26b670b30397ee14c
)
# This is a hack because absl has dumb cmake
set(OLD_BUILD_TEST ${BUILD_TESTING})
set(BUILD_TESTING OFF)
FetchContent_MakeAvailable(absl)
set(BUILD_TESTING ${OLD_BUILD_TEST})
# Supress warnings inside abseil under MSVC
if(WINDOWS)
target_compile_options(absl_strings PRIVATE /wd4018)
target_compile_options(absl_str_format_internal PRIVATE /wd4018)
target_compile_options(absl_flags_usage_internal PRIVATE /wd4018)
endif()
if (BUILD_TESTING)
FetchContent_MakeAvailable(Catch2)
endif()
#Download the rest of the libraries
FetchContent_MakeAvailable(fmt)
# Typically you don't care so much for a third party library's tests to be
# run from your own project's code.
set(JSON_BuildTests OFF CACHE INTERNAL "")
# If you only include this third party in PRIVATE source files, you do not
# need to install it when your main project gets installed.
set(JSON_Install OFF CACHE INTERNAL "")
FetchContent_MakeAvailable(nlohmann_json)
unset(CMAKE_FOLDER)
unset(CMAKE_POSITION_INDEPENDENT_CODE)
This diff is collapsed.
/**
* @file llmessageprecompiled.cpp
* @brief Includes common headers
*
* $LicenseInfo:firstyear=2019&license=viewerlgpl$
* Alchemy Viewer Source Code
* Copyright (C) 2019, Alchemy Viewer Project, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#include "llmessageprecompiled.h"
/**
* @file llmessageprecompiled.cpp
* @brief Includes common headers
*
* $LicenseInfo:firstyear=2019&license=viewerlgpl$
* Alchemy Viewer Source Code
* Copyright (C) 2019, Alchemy Viewer Project, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#include "llmessageprecompiled.h"
/**
* @file llmessageprecompiled.h
* @brief Includes common headers
*
* $LicenseInfo:firstyear=2019&license=viewerlgpl$
* Alchemy Viewer Source Code
* Copyright (C) 2019, Alchemy Viewer Project, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_LLMESSAGEPRECOMPILED_H
#define LL_LLMESSAGEPRECOMPILED_H
#include "linden_common.h"
#include "llwin32headerslean.h"
#include "llapr.h"
#include "llsd.h"
#include "llsingleton.h"
#include "llstring.h"
#include "llstringtable.h"
#include "llstl.h"
#include "lltimer.h"
#endif // LL_LLMESSAGEPRECOMPILED_H
/**
* @file llmessageprecompiled.h
* @brief Includes common headers
*
* $LicenseInfo:firstyear=2019&license=viewerlgpl$
* Alchemy Viewer Source Code
* Copyright (C) 2019, Alchemy Viewer Project, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_LLMESSAGEPRECOMPILED_H
#define LL_LLMESSAGEPRECOMPILED_H
#include "linden_common.h"
#include "llwin32headerslean.h"
#include "llapr.h"
#include "llsd.h"
#include "llsingleton.h"
#include "llstring.h"
#include "llstringtable.h"
#include "llstl.h"
#include "lltimer.h"
#endif // LL_LLMESSAGEPRECOMPILED_H
/**
* @file lluiprecompiled.cpp
* @brief Includes common headers
*
* $LicenseInfo:firstyear=2019&license=viewerlgpl$
* Alchemy Viewer Source Code
* Copyright (C) 2019, Alchemy Viewer Project, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#include "lluiprecompiled.h"
/**
* @file lluiprecompiled.cpp
* @brief Includes common headers
*
* $LicenseInfo:firstyear=2019&license=viewerlgpl$
* Alchemy Viewer Source Code
* Copyright (C) 2019, Alchemy Viewer Project, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#include "lluiprecompiled.h"
/**
* @file lluiprecompiled.h
* @brief Includes common headers
*
* $LicenseInfo:firstyear=2019&license=viewerlgpl$
* Alchemy Viewer Source Code
* Copyright (C) 2019, Alchemy Viewer Project, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_LLUIPRECOMPILED_H
#define LL_LLUIPRECOMPILED_H
#include "linden_common.h"
#include <functional>
#include <map>
#include <limits>
#include <list>
#include <memory>
#include <queue>
#include <vector>
#include "absl/container/node_hash_map.h"
#include <absl/container/flat_hash_map.h>
#include "llhandle.h"
#include "llfasttimer.h"
#include "llframetimer.h"
#include "llheteromap.h"
#include "llinitparam.h"
#include "llinstancetracker.h"
#include "llpointer.h"
#include "llregistry.h"
#include "llsd.h"
#include "llsingleton.h"
#include "llstl.h"
#include "llstring.h"
#include "lltreeiterators.h"
#include "llcoord.h"
#include "llrect.h"
#include "llquaternion.h"
#include "v2math.h"
#include "v4color.h"
#include "m3math.h"
#include "lldir.h"
#include "llgl.h"
#include "llfontgl.h"
#include "llglslshader.h"
#include "llrender2dutils.h"
#include "llcontrol.h"
#include "llxmlnode.h"
#endif // LL_LLUIPRECOMPILED_H
/**
* @file lluiprecompiled.h
* @brief Includes common headers
*
* $LicenseInfo:firstyear=2019&license=viewerlgpl$
* Alchemy Viewer Source Code
* Copyright (C) 2019, Alchemy Viewer Project, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_LLUIPRECOMPILED_H
#define LL_LLUIPRECOMPILED_H
#include "linden_common.h"
#include <functional>
#include <map>
#include <limits>
#include <list>
#include <memory>
#include <queue>
#include <vector>
#include "absl/container/node_hash_map.h"
#include <absl/container/flat_hash_map.h>
#include "llhandle.h"
#include "llfasttimer.h"
#include "llframetimer.h"
#include "llheteromap.h"
#include "llinitparam.h"
#include "llinstancetracker.h"
#include "llpointer.h"
#include "llregistry.h"
#include "llsd.h"
#include "llsingleton.h"
#include "llstl.h"
#include "llstring.h"
#include "lltreeiterators.h"
#include "llcoord.h"
#include "llrect.h"
#include "llquaternion.h"
#include "v2math.h"
#include "v4color.h"
#include "m3math.h"
#include "lldir.h"
#include "llgl.h"
#include "llfontgl.h"
#include "llglslshader.h"
#include "llrender2dutils.h"
#include "llcontrol.h"
#include "llxmlnode.h"
#endif // LL_LLUIPRECOMPILED_H
......@@ -46,7 +46,7 @@
#include "SDL2/SDL_syswm.h"
#if LL_WINDOWS
#include <commdlg.h>
#include <commdlg.h>
#include <shellapi.h>
#include "../newview/res/resource.h"
#endif
......
; First is default
!insertmacro MUI_LANGUAGE "Danish"
; Language string
LangString LanguageCode ${LANG_DANISH} "da"
; Language selection dialog
LangString SelectInstallerLanguage ${LANG_DANISH} "Vælg venligst sprog til installation"
; installation directory text
LangString DirectoryChooseTitle ${LANG_DANISH} "Installationsmappe"
LangString DirectoryChooseUpdate ${LANG_DANISH} "Vælg ${APPNAME} mappe til opdatering til version ${VERSION_LONG}.(XXX):"
LangString DirectoryChooseSetup ${LANG_DANISH} "Vælg mappe hvor ${APPNAME} skal installeres:"
; CheckStartupParams message box
LangString CheckStartupParamsMB ${LANG_DANISH} "Kunne ikke finde programmet '$INSTPROG'. Baggrundsopdatering fejlede."
; check windows version
LangString CheckWindowsVersionDP ${LANG_DANISH} "Checker Windows version..."
LangString CheckWindowsVersionMB ${LANG_DANISH} '${APPNAME} supporterer kun Windows XP.$\n$\nFors√łg p√• installation p√• Windows $R0 kan resultere i nedbrud og datatab.$\n$\n'
LangString CheckWindowsServPackMB ${LANG_DANISH} "It is recomended to run ${APPNAME} on the latest service pack for your operating system.$\nThis will help with performance and stability of the program."
LangString UseLatestServPackDP ${LANG_DANISH} "Please use Windows Update to install the latest Service Pack."
; checkifadministrator function (install)
LangString CheckAdministratorInstDP ${LANG_DANISH} "Checker rettigheder til installation..."
LangString CheckAdministratorInstMB ${LANG_DANISH} 'Det ser ud til at du benytter en konto med begrænsninger.$\nDu skal have "administrator" rettigheder for at installere ${APPNAME}.'
; checkifadministrator function (uninstall)
LangString CheckAdministratorUnInstDP ${LANG_DANISH} "Checker rettigheder til at afinstallere..."
LangString CheckAdministratorUnInstMB ${LANG_DANISH} 'Det ser ud til at du benytter en konto med begrænsninger.$\nDu skal have "administrator" rettigheder for at afinstallere ${APPNAME}.'
; checkifalreadycurrent
LangString CheckIfCurrentMB ${LANG_DANISH} "Det ser ud til at ${APPNAME} ${VERSION_LONG} allerede er installeret.$\n$\n√ėnsker du at installere igen?"
; checkcpuflags
LangString MissingSSE2 ${LANG_DANISH} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?"
; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_DANISH} "Venter på at Alchemy skal lukke ned..."
LangString CloseSecondLifeInstMB ${LANG_DANISH} "Alchemy kan ikke installeres mens programmet k√łrer.$\n$\nAfslut programmet for at forts√¶tte.$\nV√¶lg ANNUL√ČR for at afbryde installation."
; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_DANISH} "Venter på at Alchemy skal lukke ned..."
LangString CloseSecondLifeUnInstMB ${LANG_DANISH} "Alchemy kan ikke afinstalleres mens programmet k√łrer.$\n$\nAfslut programmet for at forts√¶tte.$\nV√¶lg ANNUL√ČR for at afbryde installation."
; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_DANISH} "Checker netværksforbindelse..."
; removecachefiles
LangString RemoveCacheFilesDP ${LANG_DANISH} "Sletter cache filer i dokument mappen"
; delete program files
LangString DeleteProgramFilesMB ${LANG_DANISH} "Der er stadig filer i ${APPNAME} program mappen.$\n$\nDette er sandsynligvis filer du har oprettet eller flyttet til :$\n$INSTDIR$\n$\n√ėnsker du at fjerne disse filer?"
; uninstall text
LangString UninstallTextMsg ${LANG_DANISH} "Dette vil afinstallere ${APPNAME} ${VERSION_LONG} fra dit system."
; First is default
!insertmacro MUI_LANGUAGE "Danish"
; Language string
LangString LanguageCode ${LANG_DANISH} "da"
; Language selection dialog
LangString SelectInstallerLanguage ${LANG_DANISH} "Vælg venligst sprog til installation"
; installation directory text
LangString DirectoryChooseTitle ${LANG_DANISH} "Installationsmappe"
LangString DirectoryChooseUpdate ${LANG_DANISH} "Vælg ${APPNAME} mappe til opdatering til version ${VERSION_LONG}.(XXX):"
LangString DirectoryChooseSetup ${LANG_DANISH} "Vælg mappe hvor ${APPNAME} skal installeres:"
; CheckStartupParams message box
LangString CheckStartupParamsMB ${LANG_DANISH} "Kunne ikke finde programmet '$INSTPROG'. Baggrundsopdatering fejlede."
; check windows version
LangString CheckWindowsVersionDP ${LANG_DANISH} "Checker Windows version..."
LangString CheckWindowsVersionMB ${LANG_DANISH} '${APPNAME} supporterer kun Windows XP.$\n$\nFors√łg p√• installation p√• Windows $R0 kan resultere i nedbrud og datatab.$\n$\n'
LangString CheckWindowsServPackMB ${LANG_DANISH} "It is recomended to run ${APPNAME} on the latest service pack for your operating system.$\nThis will help with performance and stability of the program."
LangString UseLatestServPackDP ${LANG_DANISH} "Please use Windows Update to install the latest Service Pack."
; checkifadministrator function (install)
LangString CheckAdministratorInstDP ${LANG_DANISH} "Checker rettigheder til installation..."
LangString CheckAdministratorInstMB ${LANG_DANISH} 'Det ser ud til at du benytter en konto med begrænsninger.$\nDu skal have "administrator" rettigheder for at installere ${APPNAME}.'
; checkifadministrator function (uninstall)
LangString CheckAdministratorUnInstDP ${LANG_DANISH} "Checker rettigheder til at afinstallere..."
LangString CheckAdministratorUnInstMB ${LANG_DANISH} 'Det ser ud til at du benytter en konto med begrænsninger.$\nDu skal have "administrator" rettigheder for at afinstallere ${APPNAME}.'
; checkifalreadycurrent
LangString CheckIfCurrentMB ${LANG_DANISH} "Det ser ud til at ${APPNAME} ${VERSION_LONG} allerede er installeret.$\n$\n√ėnsker du at installere igen?"
; checkcpuflags
LangString MissingSSE2 ${LANG_DANISH} "This machine may not have a CPU with SSE2 support, which is required to run ${APPNAME} ${VERSION_LONG}. Do you want to continue?"
; closesecondlife function (install)
LangString CloseSecondLifeInstDP ${LANG_DANISH} "Venter på at Alchemy skal lukke ned..."
LangString CloseSecondLifeInstMB ${LANG_DANISH} "Alchemy kan ikke installeres mens programmet k√łrer.$\n$\nAfslut programmet for at forts√¶tte.$\nV√¶lg ANNUL√ČR for at afbryde installation."
; closesecondlife function (uninstall)
LangString CloseSecondLifeUnInstDP ${LANG_DANISH} "Venter på at Alchemy skal lukke ned..."
LangString CloseSecondLifeUnInstMB ${LANG_DANISH} "Alchemy kan ikke afinstalleres mens programmet k√łrer.$\n$\nAfslut programmet for at forts√¶tte.$\nV√¶lg ANNUL√ČR for at afbryde installation."
; CheckNetworkConnection
LangString CheckNetworkConnectionDP ${LANG_DANISH} "Checker netværksforbindelse..."
; removecachefiles
LangString RemoveCacheFilesDP ${LANG_DANISH} "Sletter cache filer i dokument mappen"
; delete program files
LangString DeleteProgramFilesMB ${LANG_DANISH} "Der er stadig filer i ${APPNAME} program mappen.$\n$\nDette er sandsynligvis filer du har oprettet eller flyttet til :$\n$INSTDIR$\n$\n√ėnsker du at fjerne disse filer?"
; uninstall text
LangString UninstallTextMsg ${LANG_DANISH} "Dette vil afinstallere ${APPNAME} ${VERSION_LONG} fra dit system."
; First is default
!insertmacro MUI_LANGUAGE "German"
; Language string
LangString LanguageCode ${LANG_GERMAN} "de"