From: Rémi Verschelde Date: Sat, 28 Jan 2017 16:20:52 +0000 (+0100) Subject: Unify platform-specific definitions and clean .rc file X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=commitdiff_plain;h=72217fbefd03881048287da8345925e1b89b5b9b Unify platform-specific definitions and clean .rc file --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ac908f0..0965b30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,6 +119,8 @@ set(LUGARU_SRCS ${SRCDIR}/Objects/Object.cpp ${SRCDIR}/Objects/Person.cpp ${SRCDIR}/Objects/Weapons.cpp + ${SRCDIR}/Platform/PlatformUnix.cpp + ${SRCDIR}/Platform/PlatformWindows.cpp ${SRCDIR}/User/Account.cpp ${SRCDIR}/User/Settings.cpp ${SRCDIR}/Utils/Folders.cpp @@ -164,6 +166,7 @@ set(LUGARU_H ${SRCDIR}/Objects/Object.hpp ${SRCDIR}/Objects/Person.hpp ${SRCDIR}/Objects/Weapons.hpp + ${SRCDIR}/Platform/Platform.hpp ${SRCDIR}/Thirdparty/optionparser.h ${SRCDIR}/User/Account.hpp ${SRCDIR}/User/Settings.hpp @@ -177,35 +180,13 @@ set(LUGARU_H ) -if(UNIX) - set(LUGARU_SRCS - ${LUGARU_SRCS} - ${SRCDIR}/MacCompatibility.cpp - ) - set(LUGARU_H - ${LUGARU_H} - ${SRCDIR}/MacCompatibility.hpp - ) -endif(UNIX) - if(WIN32) add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj COMMAND ${CMAKE_RC_COMPILER} - -I${SRCDIR}/win-res -o ${CMAKE_CURRENT_BINARY_DIR}/lugaru_resource.obj - -i${SRCDIR}/win-res/Lugaru.rc - DEPENDS ${SRCDIR}/win-res/Lugaru.rc + -i${SRCDIR}/Lugaru.rc + DEPENDS ${SRCDIR}/Lugaru.rc ) - - # FIXME: get rid of this. - set(LUGARU_SRCS - ${LUGARU_SRCS} - ${SRCDIR}/WinDefs.cpp) - - set(LUGARU_H - ${LUGARU_H} - ${SRCDIR}/WinDefs.hpp - ${SRCDIR}/win-res/resource.hpp) endif(WIN32) if(APPLE) diff --git a/Dist/lugaru.ico b/Dist/lugaru.ico new file mode 100644 index 0000000..5a2895e Binary files /dev/null and b/Dist/lugaru.ico differ diff --git a/Source/Audio/openal_wrapper.hpp b/Source/Audio/openal_wrapper.hpp index d122030..2e7b7af 100644 --- a/Source/Audio/openal_wrapper.hpp +++ b/Source/Audio/openal_wrapper.hpp @@ -21,8 +21,8 @@ along with Lugaru. If not, see . #ifndef _OPENAL_WRAPPER_HPP_ #define _OPENAL_WRAPPER_HPP_ -#include "MacCompatibility.hpp" #include "Math/XYZ.hpp" +#include "Platform/Platform.hpp" #ifdef __APPLE__ #include diff --git a/Source/Graphic/gamegl.hpp b/Source/Graphic/gamegl.hpp index f9c6d2b..bf95b07 100644 --- a/Source/Graphic/gamegl.hpp +++ b/Source/Graphic/gamegl.hpp @@ -21,7 +21,7 @@ along with Lugaru. If not, see . #ifndef _GAMEGL_HPP_ #define _GAMEGL_HPP_ -#include "MacCompatibility.hpp" +#include "Platform/Platform.hpp" #include #include diff --git a/Source/Lugaru.rc b/Source/Lugaru.rc new file mode 100644 index 0000000..f0f8807 --- /dev/null +++ b/Source/Lugaru.rc @@ -0,0 +1,23 @@ +/* +Copyright (C) 2003, 2010 - Wolfire Games +Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) + +This file is part of Lugaru. + +Lugaru 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 2 of the License, or +(at your option) any later version. + +Lugaru 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 Lugaru. If not, see . +*/ + +LUGARU_ICON ICON "../Dist/lugaru.ico" + +// TODO: Add version info diff --git a/Source/MacCompatibility.cpp b/Source/MacCompatibility.cpp deleted file mode 100644 index 4ed3033..0000000 --- a/Source/MacCompatibility.cpp +++ /dev/null @@ -1,119 +0,0 @@ -/* -Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) - -This file is part of Lugaru. - -Lugaru 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 2 of the License, or -(at your option) any later version. - -Lugaru 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 Lugaru. If not, see . -*/ - -#include "MacCompatibility.hpp" - -#include -#include -#include -#include -#include - -#ifdef WIN32 -#include -#endif - -#if PLATFORM_UNIX -#include -#include -#include -#include - -typedef long long __int64; -typedef __int64 LARGE_INTEGER; -static int QueryPerformanceFrequency(LARGE_INTEGER* liptr) -{ - assert(sizeof(__int64) == 8); - assert(sizeof(LARGE_INTEGER) == 8); - *liptr = 1000; - return (1); -} - -static int QueryPerformanceCounter(LARGE_INTEGER* liptr) -{ - struct timeval tv; - gettimeofday(&tv, NULL); - *liptr = ((((LARGE_INTEGER)tv.tv_sec) * 1000) + - (((LARGE_INTEGER)tv.tv_usec) / 1000)); - return (1); -} -#endif - -class AppTime -{ - public: - AppTime() - { - counterRate = 1; - baseCounter = 0; - QueryPerformanceFrequency((LARGE_INTEGER*)&counterRate); - QueryPerformanceCounter((LARGE_INTEGER*)&baseCounter); - } - __int64 counterRate; // LARGE_INTEGER type has no math functions so use int64 - __int64 baseCounter; -}; -static AppTime g_appTime; - -AbsoluteTime UpTime() -{ - __int64 counter; - QueryPerformanceCounter((LARGE_INTEGER*)&counter); - - counter -= g_appTime.baseCounter; - - AbsoluteTime time; - time.lo = (unsigned long)counter; - time.hi = (unsigned long)(counter >> 32); - return time; -} - -Duration AbsoluteDeltaToDuration(AbsoluteTime& a, AbsoluteTime& b) -{ - __int64 value = a.hi; - value <<= 32; - value |= a.lo; - __int64 value2 = b.hi; - value2 <<= 32; - value2 |= b.lo; - value -= value2; - - if (value <= 0) { - return durationImmediate; - } - - __int64 frac = value % g_appTime.counterRate; - value /= g_appTime.counterRate; - - Duration time; - - if (value == 0) { - frac *= -1000000; - frac /= g_appTime.counterRate; - time = (Duration)frac; - } else { - frac *= 1000; - frac /= g_appTime.counterRate; - value *= 1000; - value += frac; - time = (Duration)value; - } - - return time; -} diff --git a/Source/MacCompatibility.hpp b/Source/MacCompatibility.hpp deleted file mode 100644 index 57cdc41..0000000 --- a/Source/MacCompatibility.hpp +++ /dev/null @@ -1,98 +0,0 @@ -/* -Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) - -This file is part of Lugaru. - -Lugaru 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 2 of the License, or -(at your option) any later version. - -Lugaru 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 Lugaru. If not, see . -*/ - -#ifndef _MACCOMPATIBLITY_HPP_ -#define _MACCOMPATIBLITY_HPP_ - -#include "Math/Random.hpp" - -#include -#include -#include - -// stuff to make Mac code compatable with Windows/Linux/etc - -#if defined(WIN32) && !defined(strcasecmp) -#define strcasecmp(a,b) stricmp(a,b) -#endif - -#ifdef _MSC_VER -// disable warnings about double to float conversions -#pragma warning(disable:4305) -#pragma warning(disable:4244) - -// disable warnings about boolean to int conversions -#pragma warning(disable:4800) - -// disable warning about unreferenced local variables -#pragma warning(disable:4101) -#endif - -#ifndef __forceinline -# ifdef __GNUC__ -# define __forceinline inline __attribute__((always_inline)) -# endif -#endif - -struct Point { - short v; - short h; -}; - -typedef signed char SInt8; -typedef unsigned int UInt32; - - - -typedef struct AbsoluteTime { - unsigned long hi; - unsigned long lo; -} AbsoluteTime; - -AbsoluteTime UpTime(); // NOTE: returns time since app started, not system start - -typedef long Duration; - -enum { - durationMicrosecond = -1, - durationMillisecond = 1, - durationSecond = 1000, - durationMinute = 1000 * 60, - durationHour = 1000 * 60 * 60, - durationDay = 1000 * 60 * 60 * 24, - durationForever = 0x7FFFFFFF, - durationImmediate = 0, -}; - -Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b); - -#ifdef _MSC_VER -inline bool isnormal( double x) -{ - int ret = _fpclass( x); - return (ret == _FPCLASS_NN || ret == _FPCLASS_PN); -} -#else -#include -#endif - -#endif - - diff --git a/Source/Platform/Platform.hpp b/Source/Platform/Platform.hpp new file mode 100644 index 0000000..1610744 --- /dev/null +++ b/Source/Platform/Platform.hpp @@ -0,0 +1,94 @@ +/* +Copyright (C) 2003, 2010 - Wolfire Games +Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) + +This file is part of Lugaru. + +Lugaru 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 2 of the License, or +(at your option) any later version. + +Lugaru 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 Lugaru. If not, see . +*/ + +#ifndef _PLATFORM_HPP_ +#define _PLATFORM_HPP_ + +#include "Math/Random.hpp" + +#include +#include +#include + +#if defined(WIN32) && !defined(strcasecmp) +#define strcasecmp(a,b) stricmp(a,b) +#endif + + +struct Point { + short v; + short h; +}; + +typedef signed char SInt8; +typedef unsigned int UInt32; + +typedef struct AbsoluteTime { + unsigned long hi; + unsigned long lo; +} AbsoluteTime; + +/* Returns time since the app started, not system start. */ +AbsoluteTime UpTime(); + +typedef long Duration; + +enum { + durationMicrosecond = -1, + durationMillisecond = 1, + durationSecond = 1000, + durationMinute = 1000 * 60, + durationHour = 1000 * 60 * 60, + durationDay = 1000 * 60 * 60 * 24, + durationForever = 0x7FFFFFFF, + durationImmediate = 0, +}; + +Duration AbsoluteDeltaToDuration(AbsoluteTime& a, AbsoluteTime& b); + + +/* Workaround missing math stuff on MSVC + * FIXME: Check that it is still necessary nowadays. + */ +#ifdef _MSC_VER +inline bool isnormal( double x) +{ + int ret = _fpclass( x); + return (ret == _FPCLASS_NN || ret == _FPCLASS_PN); +} + +inline float abs(float f) +{ + if (f < 0) + return -f; + return f; +} + +inline double abs(double d) +{ + if (d < 0) + return -d; + return d; +} +#else +#include +#endif // _MSC_VER + +#endif // _PLATFORM_HPP_ diff --git a/Source/Platform/PlatformUnix.cpp b/Source/Platform/PlatformUnix.cpp new file mode 100644 index 0000000..6ed11bf --- /dev/null +++ b/Source/Platform/PlatformUnix.cpp @@ -0,0 +1,116 @@ +/* +Copyright (C) 2003, 2010 - Wolfire Games +Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) + +This file is part of Lugaru. + +Lugaru 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 2 of the License, or +(at your option) any later version. + +Lugaru 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 Lugaru. If not, see . +*/ + +#ifdef PLATFORM_UNIX + +#include "Platform/Platform.hpp" + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +typedef long long __int64; +typedef __int64 LARGE_INTEGER; +static int QueryPerformanceFrequency(LARGE_INTEGER* liptr) +{ + assert(sizeof(__int64) == 8); + assert(sizeof(LARGE_INTEGER) == 8); + *liptr = 1000; + return (1); +} + +static int QueryPerformanceCounter(LARGE_INTEGER* liptr) +{ + struct timeval tv; + gettimeofday(&tv, NULL); + *liptr = ((((LARGE_INTEGER)tv.tv_sec) * 1000) + + (((LARGE_INTEGER)tv.tv_usec) / 1000)); + return (1); +} + +class AppTime +{ + public: + AppTime() + { + counterRate = 1; + baseCounter = 0; + QueryPerformanceFrequency((LARGE_INTEGER*)&counterRate); + QueryPerformanceCounter((LARGE_INTEGER*)&baseCounter); + } + __int64 counterRate; // LARGE_INTEGER type has no math functions so use int64 + __int64 baseCounter; +}; +static AppTime g_appTime; + +AbsoluteTime UpTime() +{ + __int64 counter; + QueryPerformanceCounter((LARGE_INTEGER*)&counter); + + counter -= g_appTime.baseCounter; + + AbsoluteTime time; + time.lo = (unsigned long)counter; + time.hi = (unsigned long)(counter >> 32); + return time; +} + +Duration AbsoluteDeltaToDuration(AbsoluteTime& a, AbsoluteTime& b) +{ + __int64 value = a.hi; + value <<= 32; + value |= a.lo; + __int64 value2 = b.hi; + value2 <<= 32; + value2 |= b.lo; + value -= value2; + + if (value <= 0) { + return durationImmediate; + } + + __int64 frac = value % g_appTime.counterRate; + value /= g_appTime.counterRate; + + Duration time; + + if (value == 0) { + frac *= -1000000; + frac /= g_appTime.counterRate; + time = (Duration)frac; + } else { + frac *= 1000; + frac /= g_appTime.counterRate; + value *= 1000; + value += frac; + time = (Duration)value; + } + + return time; +} + +#endif // PLATFORM_UNIX diff --git a/Source/Platform/PlatformWindows.cpp b/Source/Platform/PlatformWindows.cpp new file mode 100644 index 0000000..e106bf5 --- /dev/null +++ b/Source/Platform/PlatformWindows.cpp @@ -0,0 +1,91 @@ +/* +Copyright (C) 2003, 2010 - Wolfire Games +Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) + +This file is part of Lugaru. + +Lugaru 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 2 of the License, or +(at your option) any later version. + +Lugaru 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 Lugaru. If not, see . +*/ + +#ifdef _WIN32 + +#include "Platform/Platform.hpp" + +#include +#include +#include +#include + +class AppTime +{ + public: + AppTime() + { + counterRate = 1; + baseCounter = 0; + QueryPerformanceFrequency((LARGE_INTEGER*)&counterRate); + QueryPerformanceCounter((LARGE_INTEGER*)&baseCounter); + } + __int64 counterRate; // LARGE_INTEGER type has no math functions so use int64 + __int64 baseCounter; +}; +static AppTime g_appTime; + +AbsoluteTime UpTime() +{ + __int64 counter; + QueryPerformanceCounter((LARGE_INTEGER*)&counter); + + counter -= g_appTime.baseCounter; + + AbsoluteTime time; + time.lo = (unsigned long)counter; + time.hi = (unsigned long)(counter >> 32); + return time; +} + +Duration AbsoluteDeltaToDuration(AbsoluteTime& a, AbsoluteTime& b) +{ + __int64 value = a.hi; + value <<= 32; + value |= a.lo; + __int64 value2 = b.hi; + value2 <<= 32; + value2 |= b.lo; + value -= value2; + + if (value <= 0) + return durationImmediate; + + __int64 frac = value % g_appTime.counterRate; + value /= g_appTime.counterRate; + + Duration time; + + if (value == 0) { + frac *= -1000000; + frac /= g_appTime.counterRate; + time = (Duration)frac; + } else { + frac *= 1000; + frac /= g_appTime.counterRate; + value *= 1000; + value += frac; + time = (Duration)value; + } + + return time; +} + +#endif // _WIN32 diff --git a/Source/User/Account.cpp b/Source/User/Account.cpp index 50195f0..f4ba1ea 100644 --- a/Source/User/Account.cpp +++ b/Source/User/Account.cpp @@ -20,7 +20,7 @@ along with Lugaru. If not, see . #include "User/Account.hpp" -#include "MacCompatibility.hpp" +#include "Platform/Platform.hpp" #include "Utils/binio.h" #include diff --git a/Source/WinDefs.cpp b/Source/WinDefs.cpp deleted file mode 100644 index f30e129..0000000 --- a/Source/WinDefs.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* -Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) - -This file is part of Lugaru. - -Lugaru 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 2 of the License, or -(at your option) any later version. - -Lugaru 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 Lugaru. If not, see . -*/ - -#include "WinDefs.hpp" - -#include -#include -#include -#include - -class AppTime -{ - public: - AppTime() - { - counterRate = 1; - baseCounter = 0; - QueryPerformanceFrequency((LARGE_INTEGER*)&counterRate); - QueryPerformanceCounter((LARGE_INTEGER*)&baseCounter); - } - __int64 counterRate; // LARGE_INTEGER type has no math functions so use int64 - __int64 baseCounter; -}; -static AppTime g_appTime; - -AbsoluteTime UpTime() -{ - __int64 counter; - QueryPerformanceCounter((LARGE_INTEGER*)&counter); - - counter -= g_appTime.baseCounter; - - AbsoluteTime time; - time.lo = (unsigned long)counter; - time.hi = (unsigned long)(counter >> 32); - return time; -} - -Duration AbsoluteDeltaToDuration(AbsoluteTime& a, AbsoluteTime& b) -{ - __int64 value = a.hi; - value <<= 32; - value |= a.lo; - __int64 value2 = b.hi; - value2 <<= 32; - value2 |= b.lo; - value -= value2; - - if (value <= 0) - return durationImmediate; - - __int64 frac = value % g_appTime.counterRate; - value /= g_appTime.counterRate; - - Duration time; - - if (value == 0) { - frac *= -1000000; - frac /= g_appTime.counterRate; - time = (Duration)frac; - } else { - frac *= 1000; - frac /= g_appTime.counterRate; - value *= 1000; - value += frac; - time = (Duration)value; - } - - return time; -} diff --git a/Source/WinDefs.hpp b/Source/WinDefs.hpp deleted file mode 100644 index 4f29262..0000000 --- a/Source/WinDefs.hpp +++ /dev/null @@ -1,81 +0,0 @@ -/* -Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) - -This file is part of Lugaru. - -Lugaru 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 2 of the License, or -(at your option) any later version. - -Lugaru 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 Lugaru. If not, see . -*/ - -#ifndef _WINDEFS_HPP_ -#define _WINDEFS_HPP_ -#ifdef WIN32 - -#include -#include - -#include "Math/Random.hpp" - -// stuff to make Mac code compatable with Windows - -struct Point { - short v; - short h; -}; - -typedef signed char SInt8; -typedef unsigned int UInt32; - - -typedef struct AbsoluteTime { - unsigned long hi; - unsigned long lo; -} AbsoluteTime; - -AbsoluteTime UpTime(); // NOTE: returns time since app started, not system start - -typedef long Duration; - -enum { - durationMicrosecond = -1, - durationMillisecond = 1, - durationSecond = 1000, - durationMinute = 1000 * 60, - durationHour = 1000 * 60 * 60, - durationDay = 1000 * 60 * 60 * 24, - durationForever = 0x7FFFFFFF, - durationImmediate = 0, -}; - -Duration AbsoluteDeltaToDuration( AbsoluteTime& a, AbsoluteTime& b); - -#ifndef __MINGW32__ -inline float abs(float f) -{ - if (f < 0) - return -f; - return f; -} - -inline double abs(double f) -{ - if (f < 0) - return -f; - return f; -} -#endif // __MINGW32__ - - -#endif -#endif diff --git a/Source/main.cpp b/Source/main.cpp index 19bfa6e..99d5465 100644 --- a/Source/main.cpp +++ b/Source/main.cpp @@ -22,7 +22,7 @@ along with Lugaru. If not, see . #include "Audio/openal_wrapper.hpp" #include "Graphic/gamegl.hpp" -#include "MacCompatibility.hpp" +#include "Platform/Platform.hpp" #include "User/Settings.hpp" #include "Version.hpp" @@ -37,7 +37,6 @@ along with Lugaru. If not, see . using namespace Game; #ifdef WIN32 -#include "win-res/resource.hpp" #include #include #endif diff --git a/Source/win-res/Lugaru.rc b/Source/win-res/Lugaru.rc deleted file mode 100644 index 6e7c3dd..0000000 --- a/Source/win-res/Lugaru.rc +++ /dev/null @@ -1,72 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.hpp" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_LUGARU ICON "lugaru.ico" -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/Source/win-res/lugaru.ico b/Source/win-res/lugaru.ico deleted file mode 100644 index 5a2895e..0000000 Binary files a/Source/win-res/lugaru.ico and /dev/null differ diff --git a/Source/win-res/resource.hpp b/Source/win-res/resource.hpp deleted file mode 100644 index 4a3e253..0000000 --- a/Source/win-res/resource.hpp +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright (C) 2003, 2010 - Wolfire Games -Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) - -This file is part of Lugaru. - -Lugaru 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 2 of the License, or -(at your option) any later version. - -Lugaru 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 Lugaru. If not, see . -*/ - -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Lugaru.rc -// -#define IDI_LUGARU 104 - -// Next default values for new Object::objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 105 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif