diff --git a/mk/windows/vs2015-32/libzetaglest.vcxproj b/mk/windows/vs2015-32/libzetaglest.vcxproj index 5daa7126e..f941553af 100644 --- a/mk/windows/vs2015-32/libzetaglest.vcxproj +++ b/mk/windows/vs2015-32/libzetaglest.vcxproj @@ -527,51 +527,10 @@ - - + + CompileAsC CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC @@ -585,35 +544,28 @@ - - - - - + + - - - + - - + - + + + + - - - - - - - + + + diff --git a/mk/windows/vs2015-64/libzetaglest.vcxproj b/mk/windows/vs2015-64/libzetaglest.vcxproj index 4e4ff80a9..5ba89c8c0 100644 --- a/mk/windows/vs2015-64/libzetaglest.vcxproj +++ b/mk/windows/vs2015-64/libzetaglest.vcxproj @@ -385,40 +385,8 @@ - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - + + CompileAsC CompileAsC @@ -434,35 +402,28 @@ - - - - - + + - - - + - - + - + + + + - - - - - - - + + + diff --git a/mk/windows/vs2017-32/libzetaglest.vcxproj b/mk/windows/vs2017-32/libzetaglest.vcxproj index 927d97d95..ab16c3fef 100644 --- a/mk/windows/vs2017-32/libzetaglest.vcxproj +++ b/mk/windows/vs2017-32/libzetaglest.vcxproj @@ -533,51 +533,10 @@ - - + + CompileAsC CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - CompileAsC @@ -591,35 +550,28 @@ - - - - - + + - - - + - - + - + + + + - - - - - - - + + + diff --git a/mk/windows/vs2017-64/libzetaglest.vcxproj b/mk/windows/vs2017-64/libzetaglest.vcxproj index 55bdff8ea..5a0f2a297 100644 --- a/mk/windows/vs2017-64/libzetaglest.vcxproj +++ b/mk/windows/vs2017-64/libzetaglest.vcxproj @@ -387,63 +387,13 @@ ;%(IgnoreSpecificDefaultLibraries) - - - + + + CompileAsC CompileAsC - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - CompileAsC - CompileAsC - - - - - - - - - - - - - - - - - - - - - - - - + @@ -452,41 +402,31 @@ - - - - + - - - - - + + - - - + - - - - + + + + + + - - - - - - - + + + diff --git a/source/shared_lib/include/compression/compression_utils.h b/source/shared_lib/include/compression/compression_utils.h index 68586f7f4..177e722d4 100644 --- a/source/shared_lib/include/compression/compression_utils.h +++ b/source/shared_lib/include/compression/compression_utils.h @@ -1,13 +1,21 @@ -// ============================================================== -// This file is part of MegaGlest Shared Library (www.megaglest.org) +// This file is part of ZetaGlest // -// Copyright (C) 2013 Mark Vejvoda +// Copyright (C) 2018 The ZetaGlest team // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see #ifndef _SHARED_COMPRESSION_UTIL_CHECKSUM_H_ #define _SHARED_COMPRESSION_UTIL_CHECKSUM_H_ diff --git a/source/shared_lib/include/platform/common/base_thread.h b/source/shared_lib/include/platform/common/base_thread.h index 9cd0bf346..72f54cc53 100644 --- a/source/shared_lib/include/platform/common/base_thread.h +++ b/source/shared_lib/include/platform/common/base_thread.h @@ -1,14 +1,22 @@ -// ============================================================== -// This file is part of Glest Shared Library (www.glest.org) +// This file is part of ZetaGlest // -// Copyright (C) 2009-2010 Titus Tscharntke (info@titusgames.de) and -// Mark Vejvoda (mark_vejvoda@hotmail.com) +// Copyright (C) 2018 The ZetaGlest team // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see + #ifndef _SHARED_PLATFORMCOMMON_BASETHREAD_H_ #define _SHARED_PLATFORMCOMMON_BASETHREAD_H_ diff --git a/source/shared_lib/include/platform/common/byte_order.h b/source/shared_lib/include/platform/common/byte_order.h index f3a6d1da8..e9fd70087 100644 --- a/source/shared_lib/include/platform/common/byte_order.h +++ b/source/shared_lib/include/platform/common/byte_order.h @@ -1,13 +1,21 @@ -// ============================================================== -// This file is part of MegaGlest (www.megaglest.org) +// This file is part of ZetaGlest // -// Copyright (C) 2012 Mark Vejvoda +// Copyright (C) 2018 The ZetaGlest team // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see #ifndef BYTE_ORDER_H #define BYTE_ORDER_H diff --git a/source/shared_lib/include/platform/common/common_scoped_ptr.h b/source/shared_lib/include/platform/common/common_scoped_ptr.h index ad18eabc2..4bce4300b 100644 --- a/source/shared_lib/include/platform/common/common_scoped_ptr.h +++ b/source/shared_lib/include/platform/common/common_scoped_ptr.h @@ -1,13 +1,21 @@ -// ============================================================== -// This file is part of Glest Shared Library (www.glest.org) +// This file is part of ZetaGlest // -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2018 The ZetaGlest team // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see #ifndef _COMMON_SCOPED_PTR_H_ #define _COMMON_SCOPED_PTR_H_ diff --git a/source/shared_lib/include/platform/common/math_wrapper.h b/source/shared_lib/include/platform/common/math_wrapper.h index e90550b83..76f8f9e4e 100644 --- a/source/shared_lib/include/platform/common/math_wrapper.h +++ b/source/shared_lib/include/platform/common/math_wrapper.h @@ -1,14 +1,22 @@ -// ============================================================== -// This file is part of Glest Shared Library (www.glest.org) +// This file is part of ZetaGlest // -// Copyright (C) 2009-2010 Titus Tscharntke (info@titusgames.de) and -// Mark Vejvoda (mark_vejvoda@hotmail.com) +// Copyright (C) 2018 The ZetaGlest team // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see + #ifndef _SHARED_PLATFORMCOMMON_MATHWRAPPER_H_ #define _SHARED_PLATFORMCOMMON_MATHWRAPPER_H_ diff --git a/source/shared_lib/include/platform/common/platform_common.h b/source/shared_lib/include/platform/common/platform_common.h index 22e513c40..8976f31a6 100644 --- a/source/shared_lib/include/platform/common/platform_common.h +++ b/source/shared_lib/include/platform/common/platform_common.h @@ -1,13 +1,22 @@ -// ============================================================== -// This file is part of Glest Shared Library (www.glest.org) +// This file is part of ZetaGlest // -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2018 The ZetaGlest team // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see + #ifndef _SHARED_PLATFORM_PLATFORMCOMMON_H_ #define _SHARED_PLATFORM_PLATFORMCOMMON_H_ diff --git a/source/shared_lib/include/platform/common/simple_threads.h b/source/shared_lib/include/platform/common/simple_threads.h index ac59fbf63..fa025eef5 100644 --- a/source/shared_lib/include/platform/common/simple_threads.h +++ b/source/shared_lib/include/platform/common/simple_threads.h @@ -1,13 +1,22 @@ -// ============================================================== -// This file is part of Glest Shared Library (www.glest.org) +// This file is part of ZetaGlest // -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2018 The ZetaGlest team // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see + #ifndef _SHARED_PLATFORMCOMMON_SIMPLETHREAD_H_ #define _SHARED_PLATFORMCOMMON_SIMPLETHREAD_H_ diff --git a/source/shared_lib/include/platform/miniupnpc/declspec.h b/source/shared_lib/include/platform/miniupnpc/declspec.h index b7f2d8f71..cff84a3c8 100644 --- a/source/shared_lib/include/platform/miniupnpc/declspec.h +++ b/source/shared_lib/include/platform/miniupnpc/declspec.h @@ -1,3 +1,22 @@ +// This file is part of ZetaGlest +// +// Copyright (C) 2018 The ZetaGlest team +// +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see + #ifndef __DECLSPEC_H__ #define __DECLSPEC_H__ diff --git a/source/shared_lib/include/platform/miniupnpc/miniupnpc.h b/source/shared_lib/include/platform/miniupnpc/miniupnpc.h index a3247358f..d91862182 100644 --- a/source/shared_lib/include/platform/miniupnpc/miniupnpc.h +++ b/source/shared_lib/include/platform/miniupnpc/miniupnpc.h @@ -151,4 +151,3 @@ extern "C" { #endif #endif - diff --git a/source/shared_lib/include/platform/miniupnpc/miniupnpc_declspec.h b/source/shared_lib/include/platform/miniupnpc/miniupnpc_declspec.h index 5dcb45762..ba6d8ccc2 100644 --- a/source/shared_lib/include/platform/miniupnpc/miniupnpc_declspec.h +++ b/source/shared_lib/include/platform/miniupnpc/miniupnpc_declspec.h @@ -18,4 +18,3 @@ #endif #endif /* MINIUPNPC_DECLSPEC_H_INCLUDED */ - diff --git a/source/shared_lib/include/platform/miniupnpc/miniupnpcstrings.h b/source/shared_lib/include/platform/miniupnpc/miniupnpcstrings.h index d981addac..cda084ee7 100644 --- a/source/shared_lib/include/platform/miniupnpc/miniupnpcstrings.h +++ b/source/shared_lib/include/platform/miniupnpc/miniupnpcstrings.h @@ -25,4 +25,3 @@ #define MINIUPNPC_API_VERSION 15 #endif - diff --git a/source/shared_lib/include/platform/miniupnpc/miniupnpctypes.h b/source/shared_lib/include/platform/miniupnpc/miniupnpctypes.h index 591c32fb6..d9a2f97fa 100644 --- a/source/shared_lib/include/platform/miniupnpc/miniupnpctypes.h +++ b/source/shared_lib/include/platform/miniupnpc/miniupnpctypes.h @@ -16,4 +16,3 @@ #endif #endif - diff --git a/source/shared_lib/include/platform/miniupnpc/miniwget.h b/source/shared_lib/include/platform/miniupnpc/miniwget.h index a5569a1b4..f2c62ccaa 100644 --- a/source/shared_lib/include/platform/miniupnpc/miniwget.h +++ b/source/shared_lib/include/platform/miniupnpc/miniwget.h @@ -27,4 +27,3 @@ extern "C" { #endif #endif - diff --git a/source/shared_lib/include/platform/miniupnpc/minixml.h b/source/shared_lib/include/platform/miniupnpc/minixml.h index b74a64956..24f7dafda 100644 --- a/source/shared_lib/include/platform/miniupnpc/minixml.h +++ b/source/shared_lib/include/platform/miniupnpc/minixml.h @@ -34,4 +34,3 @@ struct xmlparser { void parsexml(struct xmlparser *); #endif - diff --git a/source/shared_lib/include/platform/sdl/data_types.h b/source/shared_lib/include/platform/sdl/data_types.h index 60a928902..575d0a319 100644 --- a/source/shared_lib/include/platform/sdl/data_types.h +++ b/source/shared_lib/include/platform/sdl/data_types.h @@ -1,13 +1,21 @@ -// ============================================================== -// This file is part of Glest Shared Library (www.glest.org) +// This file is part of ZetaGlest // -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2018 The ZetaGlest team // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see #ifndef _SHARED_PLATFORM_TYPES_H_ #define _SHARED_PLATFORM_TYPES_H_ diff --git a/source/shared_lib/include/platform/sdl/factory_repository.h b/source/shared_lib/include/platform/sdl/factory_repository.h index 2abc439b1..337b894db 100644 --- a/source/shared_lib/include/platform/sdl/factory_repository.h +++ b/source/shared_lib/include/platform/sdl/factory_repository.h @@ -1,13 +1,21 @@ -// ============================================================== -// This file is part of Glest Shared Library (www.glest.org) +// This file is part of ZetaGlest // -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2018 The ZetaGlest team // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see #ifndef _SHARED_PLATFORM_FACTORYREPOSITORY_H_ #define _SHARED_PLATFORM_FACTORYREPOSITORY_H_ diff --git a/source/shared_lib/include/platform/sdl/platform_util.h b/source/shared_lib/include/platform/sdl/platform_util.h index 653e3e525..2b513cdd3 100644 --- a/source/shared_lib/include/platform/sdl/platform_util.h +++ b/source/shared_lib/include/platform/sdl/platform_util.h @@ -1,13 +1,22 @@ -// ============================================================== -// This file is part of Glest Shared Library (www.glest.org) +// This file is part of ZetaGlest // -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2018 The ZetaGlest team // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see + #ifndef _SHARED_PLATFORM_PLATFORMUTIL_H_ #define _SHARED_PLATFORM_PLATFORMUTIL_H_ diff --git a/source/shared_lib/include/sound/openal/sound_factory_openal.h b/source/shared_lib/include/sound/openal/sound_factory_openal.h index 9756aecba..03fb76d02 100644 --- a/source/shared_lib/include/sound/openal/sound_factory_openal.h +++ b/source/shared_lib/include/sound/openal/sound_factory_openal.h @@ -1,10 +1,21 @@ -//This file is part of Glest Shared Library (www.glest.org) -//Copyright (C) 2005 Matthias Braun +// This file is part of ZetaGlest +// +// Copyright (C) 2018 The ZetaGlest team +// +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. -//You can redistribute this code and/or modify it under -//the terms of the GNU General Public License as published by the Free Software -//Foundation; either version 2 of the License, or (at your option) any later -//version. +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see #ifndef _SHARED_SOUND_SOUNDFACTORYSDL_H_ #define _SHARED_SOUND_SOUNDFACTORYSDL_H_ diff --git a/source/shared_lib/include/util/utf8/checked.h b/source/shared_lib/include/util/utf8/checked.h index b6a5f9d84..e154158bd 100644 --- a/source/shared_lib/include/util/utf8/checked.h +++ b/source/shared_lib/include/util/utf8/checked.h @@ -1,32 +1,25 @@ -// Copyright 2006 Nemanja Trifunovic +// This file is part of ZetaGlest +// +// Copyright (C) 2018 The ZetaGlest team +// +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. -/* -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. -*/ +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see -#ifndef UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 -#define UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 +#ifndef UTF8_FOR_CPP_CHECKED_H +#define UTF8_FOR_CPP_CHECKED_H #include "core.h" #include @@ -323,5 +316,3 @@ namespace utf8 } // namespace utf8 #endif //header guard - - diff --git a/source/shared_lib/include/util/utf8/core.h b/source/shared_lib/include/util/utf8/core.h index a4a2d93de..78bceec82 100644 --- a/source/shared_lib/include/util/utf8/core.h +++ b/source/shared_lib/include/util/utf8/core.h @@ -1,32 +1,25 @@ -// Copyright 2006 Nemanja Trifunovic +// This file is part of ZetaGlest +// +// Copyright (C) 2018 The ZetaGlest team +// +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. -/* -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. -*/ +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see -#ifndef UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 -#define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 +#ifndef UTF8_FOR_CPP_CORE_H +#define UTF8_FOR_CPP_CORE_H #include @@ -428,5 +421,3 @@ namespace internal } // namespace utf8 #endif // header guard - - diff --git a/source/shared_lib/include/util/utf8/unchecked.h b/source/shared_lib/include/util/utf8/unchecked.h index 2f3eb4d1d..9409c9b04 100644 --- a/source/shared_lib/include/util/utf8/unchecked.h +++ b/source/shared_lib/include/util/utf8/unchecked.h @@ -1,32 +1,25 @@ -// Copyright 2006 Nemanja Trifunovic +// This file is part of ZetaGlest +// +// Copyright (C) 2018 The ZetaGlest team +// +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. -/* -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. -*/ +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see -#ifndef UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 -#define UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731 +#ifndef UTF8_FOR_CPP_UNCHECKED_H +#define UTF8_FOR_CPP_UNCHECKED_H #include "core.h" @@ -225,4 +218,3 @@ namespace utf8 #endif // header guard - diff --git a/source/shared_lib/sources/graphics/FileReader.cpp b/source/shared_lib/sources/graphics/FileReader.cpp deleted file mode 100644 index 40d07351d..000000000 --- a/source/shared_lib/sources/graphics/FileReader.cpp +++ /dev/null @@ -1,13 +0,0 @@ -// ============================================================== -// This file is part of MegaGlest Shared Library (www.megaglest.org) -// -// Copyright (C) 2012 Mark Vejvoda, Titus Tscharntke -// The MegaGlest Team, under GNU GPL v3.0 -// ============================================================== - -#include "FileReader.h" - -namespace Shared { - - -} diff --git a/source/shared_lib/sources/platform/common/byte_order.cpp b/source/shared_lib/sources/platform/common/byte_order.cpp deleted file mode 100644 index a257a814f..000000000 --- a/source/shared_lib/sources/platform/common/byte_order.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// ============================================================== -// This file is part of MegaGlest (www.megaglest.org) -// -// Copyright (C) 2012 Mark Vejvoda -// -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== - -#include "byte_order.h" - -namespace Shared { - namespace PlatformByteOrder { - - - } -}; diff --git a/source/shared_lib/sources/platform/miniupnpc/miniupnpc.c b/source/shared_lib/sources/platform/miniupnpc/miniupnpc.c index 5ff3381d2..0451e8b12 100644 --- a/source/shared_lib/sources/platform/miniupnpc/miniupnpc.c +++ b/source/shared_lib/sources/platform/miniupnpc/miniupnpc.c @@ -629,4 +629,3 @@ UPNP_GetIGDFromUrl(const char * rootdescurl, return 0; } } - diff --git a/source/shared_lib/sources/platform/miniupnpc/miniwget.c b/source/shared_lib/sources/platform/miniupnpc/miniwget.c index 1cb8c5d1f..d65f25002 100644 --- a/source/shared_lib/sources/platform/miniupnpc/miniwget.c +++ b/source/shared_lib/sources/platform/miniupnpc/miniwget.c @@ -571,4 +571,3 @@ miniwget_getaddr(const char * url, int * size, #endif return miniwget2(hostname, port, path, size, addr, addrlen, scope_id); } - diff --git a/source/shared_lib/sources/platform/miniupnpc/minixml.c b/source/shared_lib/sources/platform/miniupnpc/minixml.c index 50f4891ce..364d40d8d 100644 --- a/source/shared_lib/sources/platform/miniupnpc/minixml.c +++ b/source/shared_lib/sources/platform/miniupnpc/minixml.c @@ -190,5 +190,3 @@ void parsexml(struct xmlparser * parser) { parser->xmlend = parser->xmlstart + parser->xmlsize; parseelt(parser); } - - diff --git a/source/shared_lib/sources/platform/miniupnpc/minixmlvalid.c b/source/shared_lib/sources/platform/miniupnpc/minixmlvalid.c index e9d67f78d..0174d9fb7 100644 --- a/source/shared_lib/sources/platform/miniupnpc/minixmlvalid.c +++ b/source/shared_lib/sources/platform/miniupnpc/minixmlvalid.c @@ -152,4 +152,3 @@ int testxmlparser(const char * xml, int size) { printf("minixml validation test failed\n"); return r; }*/ - diff --git a/source/shared_lib/sources/platform/sdl/factory_repository.cpp b/source/shared_lib/sources/platform/sdl/factory_repository.cpp index 0c7ec11e9..e9b34e7ec 100644 --- a/source/shared_lib/sources/platform/sdl/factory_repository.cpp +++ b/source/shared_lib/sources/platform/sdl/factory_repository.cpp @@ -1,13 +1,23 @@ -// ============================================================== -// This file is part of Glest Shared Library (www.glest.org) +// This file is part of ZetaGlest // -// Copyright (C) 2005 Matthias Braun +// Copyright (C) 2018 The ZetaGlest team // -// You can redistribute this code and/or modify it under -// the terms of the GNU General Public License as published -// by the Free Software Foundation; either version 2 of the -// License, or (at your option) any later version -// ============================================================== +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see + +#ifndef _WIN32 #include "factory_repository.h" @@ -42,3 +52,5 @@ SoundFactory *FactoryRepository::getSoundFactory(const string &name) { } }}//end namespace + +#endif diff --git a/source/shared_lib/sources/platform/sdl/platform_util.cpp b/source/shared_lib/sources/platform/sdl/platform_util.cpp index b8b3a769b..b71878d1d 100644 --- a/source/shared_lib/sources/platform/sdl/platform_util.cpp +++ b/source/shared_lib/sources/platform/sdl/platform_util.cpp @@ -1,18 +1,37 @@ -// ============================================================== -//This file is part of Glest Shared Library (www.glest.org) -//Copyright (C) 2005 Matthias Braun +// This file is part of ZetaGlest +// +// Copyright (C) 2018 The ZetaGlest team +// +// ZetaGlest is a fork of MegaGlest +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// This program 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 General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see + +#ifndef _WIN32 -//You can redistribute this code and/or modify it under -//the terms of the GNU General Public License as published by the Free Software -//Foundation; either version 2 of the License, or (at your option) any later -//version. #include "platform_util.h" #include #include -#include #include "util.h" #include "conversion.h" +#if defined(WIN32) || defined(_WIN32) +#define popen _popen +#define pclose _pclose +#else +#include +#endif + // For gcc backtrace on crash! #if defined(HAS_GCC_BACKTRACE) @@ -347,3 +366,5 @@ megaglest_runtime_error::megaglest_runtime_error(const string& __arg,bool noStac } }}//end namespace + +#endif diff --git a/source/shared_lib/sources/platform/win32/factory_repository.cpp b/source/shared_lib/sources/platform/win32/win32_factory_repository.cpp similarity index 100% rename from source/shared_lib/sources/platform/win32/factory_repository.cpp rename to source/shared_lib/sources/platform/win32/win32_factory_repository.cpp diff --git a/source/shared_lib/sources/platform/win32/platform_util.cpp b/source/shared_lib/sources/platform/win32/win32_platform_util.cpp similarity index 100% rename from source/shared_lib/sources/platform/win32/platform_util.cpp rename to source/shared_lib/sources/platform/win32/win32_platform_util.cpp