From: T2@kimikage Date: Mon, 19 Jul 2010 04:50:20 +0000 (+0900) Subject: ライセンスをMIT-Styleに変更，DLL内にライセンス埋め込み X-Git-Url: http://git.osdn.net/view?p=kimikage-nscr%2Fkimikage-nscr.git;a=commitdiff_plain;h=1917231da6d7757169fdf7f151d73708d44b880b ライセンスをMIT-Styleに変更，DLL内にライセンス埋め込み --- diff --git a/.gitignore b/.gitignore index b3e9ae3..76cc141 100755 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ *.ncb *.suo *.user -*/vs20*/Debug \ No newline at end of file +*.aps +*/vs20*/Debug +*/vs20*/Release \ No newline at end of file diff --git a/common/src/license.cpp b/common/src/license.cpp new file mode 100755 index 0000000..c9fa807 --- /dev/null +++ b/common/src/license.cpp @@ -0,0 +1,40 @@ +/* + * Kimikage NScripter Plugins Project + * + * This software is distributed under a MIT-style license. + * See license.txt for more information. + */ + +#define NOMINMAX +#include +#include + +extern "C" +{ + __declspec(dllexport) void + license(HWND hwnd, HINSTANCE hinst, LPSTR lpszCmdLine, int nCmdShow); +} + +void license(HWND hwnd, HINSTANCE hinst, LPSTR lpszCmdLine, int nCmdShow) +{ + const char text[] = "Copyright (c) 2010 The Kimikage NScripter Plugins Project\n\ +\n\ +Permission is hereby granted, free of charge, to any person obtaining a copy\n\ +of this software and associated documentation files (the \"Software\"), to deal\n\ +in the Software without restriction, including without limitation the rights\n\ +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n\ +copies of the Software, and to permit persons to whom the Software is\n\ +furnished to do so, subject to the following conditions:\n\ +\n\ +The above copyright notice and this permission notice shall be included in\n\ +all copies or substantial portions of the Software.\n\ +\n\ +THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n\ +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n\ +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n\ +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n\ +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n\ +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n\ +THE SOFTWARE."; + MessageBox( hwnd, text, "License", MB_OK | MB_ICONINFORMATION); +} diff --git a/common/src/nslua.h b/common/src/nslua.h index dff6275..261f379 100755 --- a/common/src/nslua.h +++ b/common/src/nslua.h @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/license.txt b/license.txt index c474ea7..1895be8 100755 --- a/license.txt +++ b/license.txt @@ -1,24 +1,19 @@ -Copyright (c) 2010, The Kimikage NScripter Plugins Project -All rights reserved. +Copyright (c) 2010 The Kimikage NScripter Plugins Project -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the Kimikage NScripter Plugins Project nor the names - of its contributors may be used to endorse or promote products derived - from this software without specific prior written permission. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/nsdfont/src/ArgbArray.h b/nsdfont/src/ArgbArray.h index 65ced82..40b44ee 100755 --- a/nsdfont/src/ArgbArray.h +++ b/nsdfont/src/ArgbArray.h @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/ArgbBitmap.cpp b/nsdfont/src/ArgbBitmap.cpp index 717cbeb..438b2aa 100755 --- a/nsdfont/src/ArgbBitmap.cpp +++ b/nsdfont/src/ArgbBitmap.cpp @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/ArgbBitmap.h b/nsdfont/src/ArgbBitmap.h index d753a84..36c716f 100755 --- a/nsdfont/src/ArgbBitmap.h +++ b/nsdfont/src/ArgbBitmap.h @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/CharacterMap.cpp b/nsdfont/src/CharacterMap.cpp index 9277180..41e2538 100755 --- a/nsdfont/src/CharacterMap.cpp +++ b/nsdfont/src/CharacterMap.cpp @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/CharacterMap.h b/nsdfont/src/CharacterMap.h index 0106e7f..59912a6 100755 --- a/nsdfont/src/CharacterMap.h +++ b/nsdfont/src/CharacterMap.h @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/Color.h b/nsdfont/src/Color.h index 96fbcc6..de05102 100755 --- a/nsdfont/src/Color.h +++ b/nsdfont/src/Color.h @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/ColorBlender.cpp b/nsdfont/src/ColorBlender.cpp index 6926ce1..6b0787a 100755 --- a/nsdfont/src/ColorBlender.cpp +++ b/nsdfont/src/ColorBlender.cpp @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/ColorBlender.h b/nsdfont/src/ColorBlender.h index cd68b6b..d33c6af 100755 --- a/nsdfont/src/ColorBlender.h +++ b/nsdfont/src/ColorBlender.h @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/Decorator.cpp b/nsdfont/src/Decorator.cpp index fff1586..d5e6d01 100755 --- a/nsdfont/src/Decorator.cpp +++ b/nsdfont/src/Decorator.cpp @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/Decorator.h b/nsdfont/src/Decorator.h index d822958..a4ad98a 100755 --- a/nsdfont/src/Decorator.h +++ b/nsdfont/src/Decorator.h @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/Glyph.cpp b/nsdfont/src/Glyph.cpp index 0686456..d85fedf 100755 --- a/nsdfont/src/Glyph.cpp +++ b/nsdfont/src/Glyph.cpp @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/Glyph.h b/nsdfont/src/Glyph.h index b1b7e71..79ba843 100755 --- a/nsdfont/src/Glyph.h +++ b/nsdfont/src/Glyph.h @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/Typesetter.cpp b/nsdfont/src/Typesetter.cpp index c6bcba5..e1914d3 100755 --- a/nsdfont/src/Typesetter.cpp +++ b/nsdfont/src/Typesetter.cpp @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/Typesetter.h b/nsdfont/src/Typesetter.h index dd10760..501c126 100755 --- a/nsdfont/src/Typesetter.h +++ b/nsdfont/src/Typesetter.h @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/UnicodeString.cpp b/nsdfont/src/UnicodeString.cpp index 8c7d289..16c6646 100755 --- a/nsdfont/src/UnicodeString.cpp +++ b/nsdfont/src/UnicodeString.cpp @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/UnicodeString.h b/nsdfont/src/UnicodeString.h index d5d6e34..22ba2b1 100755 --- a/nsdfont/src/UnicodeString.h +++ b/nsdfont/src/UnicodeString.h @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ diff --git a/nsdfont/src/main.cpp b/nsdfont/src/main.cpp index 419e7a8..46ed23c 100755 --- a/nsdfont/src/main.cpp +++ b/nsdfont/src/main.cpp @@ -1,7 +1,7 @@ /* * Kimikage NScripter Plugins Project * - * This software is distributed under a BSD-style license. + * This software is distributed under a MIT-style license. * See license.txt for more information. */ @@ -19,7 +19,8 @@ #include "Typesetter.h" using namespace nsdfont; -extern "C" { +extern "C" +{ __declspec(dllexport) void Font( unsigned char *bits, int w, int h, const char *param ); __declspec(dllexport) LUALIB_API int luaopen_nsdfont( lua_State *L ); } diff --git a/nsdfont/src/nsdfont.rc b/nsdfont/src/nsdfont.rc new file mode 100755 index 0000000..6c465a9 --- /dev/null +++ b/nsdfont/src/nsdfont.rc @@ -0,0 +1,102 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// “ú–{Œê resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) +#ifdef _WIN32 +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +#pragma code_page(932) +#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 + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 0,0,0,1 + PRODUCTVERSION 0,0,0,1 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "041104b0" + BEGIN + VALUE "CompanyName", "ŒN‰e‘H–[" + VALUE "FileDescription", "ƒOƒŠƒt‰æ‘œ‚𐶐¬‚µ‚Ü‚·B" + VALUE "FileVersion", "0, 0, 0, 1" + VALUE "InternalName", "nsdfont" + VALUE "LegalCopyright", "Copyright (c) 2010, The Kimikage NScripter Plugins Project. All rights reserved." + VALUE "OriginalFilename", "nsdfont.dll" + VALUE "ProductName", "NSDƒtƒHƒ“ƒgƒvƒ‰ƒOƒCƒ“" + VALUE "ProductVersion", "0, 0, 0, 1" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x411, 1200 + END +END + +#endif // “ú–{Œê resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/nsdfont/src/resource.h b/nsdfont/src/resource.h new file mode 100755 index 0000000..d31d0e4 --- /dev/null +++ b/nsdfont/src/resource.h @@ -0,0 +1,14 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by nsdfont.rc + +// V‚µ‚¢ƒIƒuƒWƒFƒNƒg‚ÌŽŸ‚ÌŠù’è’l +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/nsdfont/vs2005/nsdfont.vcproj b/nsdfont/vs2005/nsdfont.vcproj index 83c2076..60e1a69 100755 --- a/nsdfont/vs2005/nsdfont.vcproj +++ b/nsdfont/vs2005/nsdfont.vcproj @@ -191,6 +191,10 @@ > + + @@ -241,6 +245,10 @@ > + + @@ -254,6 +262,10 @@ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" > + +