ライセンスをMIT-Styleに変更，DLL内にライセンス埋め込み

diff --git a/.gitignore b/.gitignore
index b3e9ae3..76cc141 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@
 *.ncb\r
 *.suo\r
 *.user\r
-*/vs20*/Debug
\ No newline at end of file
+*.aps\r
+*/vs20*/Debug\r
+*/vs20*/Release
\ No newline at end of file

diff --git a/common/src/license.cpp b/common/src/license.cpp
new file mode 100755 (executable)
index 0000000..c9fa807
--- /dev/null
+++ b/common/src/license.cpp
@@ -0,0 +1,40 @@
+/*\r
+ *     Kimikage NScripter Plugins Project\r
+ *\r
+ *     This software is distributed under a MIT-style license.\r
+ *     See license.txt for more information.\r
+ */\r
+\r
+#define NOMINMAX\r
+#include <windows.h>\r
+#include <iostream>\r
+\r
+extern "C"\r
+{\r
+       __declspec(dllexport) void\r
+               license(HWND hwnd, HINSTANCE hinst, LPSTR lpszCmdLine, int nCmdShow);\r
+}\r
+\r
+void license(HWND hwnd, HINSTANCE hinst, LPSTR lpszCmdLine, int nCmdShow)\r
+{\r
+       const char text[] = "Copyright (c) 2010 The Kimikage NScripter Plugins Project\n\\r
+\n\\r
+Permission is hereby granted, free of charge, to any person obtaining a copy\n\\r
+of this software and associated documentation files (the \"Software\"), to deal\n\\r
+in the Software without restriction, including without limitation the rights\n\\r
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n\\r
+copies of the Software, and to permit persons to whom the Software is\n\\r
+furnished to do so, subject to the following conditions:\n\\r
+\n\\r
+The above copyright notice and this permission notice shall be included in\n\\r
+all copies or substantial portions of the Software.\n\\r
+\n\\r
+THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n\\r
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n\\r
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n\\r
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n\\r
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n\\r
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n\\r
+THE SOFTWARE.";\r
+       MessageBox( hwnd, text, "License", MB_OK | MB_ICONINFORMATION);\r
+}\r

diff --git a/common/src/nslua.h b/common/src/nslua.h
index dff6275..261f379 100755 (executable)
--- a/common/src/nslua.h
+++ b/common/src/nslua.h
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/license.txt b/license.txt
index c474ea7..1895be8 100755 (executable)
--- a/license.txt
+++ b/license.txt
@@ -1,24 +1,19 @@
-Copyright (c) 2010, The Kimikage NScripter Plugins Project\r
-All rights reserved.\r
+Copyright (c) 2010 The Kimikage NScripter Plugins Project\r
 \r
-Redistribution and use in source and binary forms, with or without\r
-modification, are permitted provided that the following conditions are met:\r
-    * Redistributions of source code must retain the above copyright\r
-      notice, this list of conditions and the following disclaimer.\r
-    * Redistributions in binary form must reproduce the above copyright\r
-      notice, this list of conditions and the following disclaimer in the\r
-      documentation and/or other materials provided with the distribution.\r
-    * Neither the name of the Kimikage NScripter Plugins Project nor the names \r
-      of its contributors may be used to endorse or promote products derived \r
-      from this software without specific prior written permission.\r
+Permission is hereby granted, free of charge, to any person obtaining a copy\r
+of this software and associated documentation files (the "Software"), to deal\r
+in the Software without restriction, including without limitation the rights\r
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
+copies of the Software, and to permit persons to whom the Software is\r
+furnished to do so, subject to the following conditions:\r
 \r
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND\r
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\r
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE \r
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL \r
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR \r
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER \r
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, \r
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE \r
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
+The above copyright notice and this permission notice shall be included in\r
+all copies or substantial portions of the Software.\r
+\r
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
+THE SOFTWARE.
\ No newline at end of file

diff --git a/nsdfont/src/ArgbArray.h b/nsdfont/src/ArgbArray.h
index 65ced82..40b44ee 100755 (executable)
--- a/nsdfont/src/ArgbArray.h
+++ b/nsdfont/src/ArgbArray.h
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/ArgbBitmap.cpp b/nsdfont/src/ArgbBitmap.cpp
index 717cbeb..438b2aa 100755 (executable)
--- a/nsdfont/src/ArgbBitmap.cpp
+++ b/nsdfont/src/ArgbBitmap.cpp
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/ArgbBitmap.h b/nsdfont/src/ArgbBitmap.h
index d753a84..36c716f 100755 (executable)
--- a/nsdfont/src/ArgbBitmap.h
+++ b/nsdfont/src/ArgbBitmap.h
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/CharacterMap.cpp b/nsdfont/src/CharacterMap.cpp
index 9277180..41e2538 100755 (executable)
--- a/nsdfont/src/CharacterMap.cpp
+++ b/nsdfont/src/CharacterMap.cpp
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/CharacterMap.h b/nsdfont/src/CharacterMap.h
index 0106e7f..59912a6 100755 (executable)
--- a/nsdfont/src/CharacterMap.h
+++ b/nsdfont/src/CharacterMap.h
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/Color.h b/nsdfont/src/Color.h
index 96fbcc6..de05102 100755 (executable)
--- a/nsdfont/src/Color.h
+++ b/nsdfont/src/Color.h
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/ColorBlender.cpp b/nsdfont/src/ColorBlender.cpp
index 6926ce1..6b0787a 100755 (executable)
--- a/nsdfont/src/ColorBlender.cpp
+++ b/nsdfont/src/ColorBlender.cpp
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/ColorBlender.h b/nsdfont/src/ColorBlender.h
index cd68b6b..d33c6af 100755 (executable)
--- a/nsdfont/src/ColorBlender.h
+++ b/nsdfont/src/ColorBlender.h
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/Decorator.cpp b/nsdfont/src/Decorator.cpp
index fff1586..d5e6d01 100755 (executable)
--- a/nsdfont/src/Decorator.cpp
+++ b/nsdfont/src/Decorator.cpp
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/Decorator.h b/nsdfont/src/Decorator.h
index d822958..a4ad98a 100755 (executable)
--- a/nsdfont/src/Decorator.h
+++ b/nsdfont/src/Decorator.h
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/Glyph.cpp b/nsdfont/src/Glyph.cpp
index 0686456..d85fedf 100755 (executable)
--- a/nsdfont/src/Glyph.cpp
+++ b/nsdfont/src/Glyph.cpp
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/Glyph.h b/nsdfont/src/Glyph.h
index b1b7e71..79ba843 100755 (executable)
--- a/nsdfont/src/Glyph.h
+++ b/nsdfont/src/Glyph.h
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/Typesetter.cpp b/nsdfont/src/Typesetter.cpp
index c6bcba5..e1914d3 100755 (executable)
--- a/nsdfont/src/Typesetter.cpp
+++ b/nsdfont/src/Typesetter.cpp
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/Typesetter.h b/nsdfont/src/Typesetter.h
index dd10760..501c126 100755 (executable)
--- a/nsdfont/src/Typesetter.h
+++ b/nsdfont/src/Typesetter.h
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/UnicodeString.cpp b/nsdfont/src/UnicodeString.cpp
index 8c7d289..16c6646 100755 (executable)
--- a/nsdfont/src/UnicodeString.cpp
+++ b/nsdfont/src/UnicodeString.cpp
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/UnicodeString.h b/nsdfont/src/UnicodeString.h
index d5d6e34..22ba2b1 100755 (executable)
--- a/nsdfont/src/UnicodeString.h
+++ b/nsdfont/src/UnicodeString.h
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r

diff --git a/nsdfont/src/main.cpp b/nsdfont/src/main.cpp
index 419e7a8..46ed23c 100755 (executable)
--- a/nsdfont/src/main.cpp
+++ b/nsdfont/src/main.cpp
@@ -1,7 +1,7 @@
 /*\r
  *     Kimikage NScripter Plugins Project\r
  *\r
- *     This software is distributed under a BSD-style license.\r
+ *     This software is distributed under a MIT-style license.\r
  *     See license.txt for more information.\r
  */\r
 \r
@@ -19,7 +19,8 @@
 #include "Typesetter.h"\r
 using namespace nsdfont;\r
 \r
-extern "C" {\r
+extern "C"\r
+{\r
        __declspec(dllexport) void Font( unsigned char *bits, int w, int h, const char *param );\r
        __declspec(dllexport) LUALIB_API int luaopen_nsdfont( lua_State *L );\r
 }\r

diff --git a/nsdfont/src/nsdfont.rc b/nsdfont/src/nsdfont.rc
new file mode 100755 (executable)
index 0000000..6c465a9
--- /dev/null
+++ b/nsdfont/src/nsdfont.rc
@@ -0,0 +1,102 @@
+// Microsoft Visual C++ generated resource script.\r
+//\r
+#include "resource.h"\r
+\r
+#define APSTUDIO_READONLY_SYMBOLS\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 2 resource.\r
+//\r
+#include "afxres.h"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#undef APSTUDIO_READONLY_SYMBOLS\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+// \93ú\96{\8cê resources\r
+\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)\r
+#ifdef _WIN32\r
+LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT\r
+#pragma code_page(932)\r
+#endif //_WIN32\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// TEXTINCLUDE\r
+//\r
+\r
+1 TEXTINCLUDE \r
+BEGIN\r
+    "resource.h\0"\r
+END\r
+\r
+2 TEXTINCLUDE \r
+BEGIN\r
+    "#include ""afxres.h""\r\n"\r
+    "\0"\r
+END\r
+\r
+3 TEXTINCLUDE \r
+BEGIN\r
+    "\r\n"\r
+    "\0"\r
+END\r
+\r
+#endif    // APSTUDIO_INVOKED\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Version\r
+//\r
+\r
+VS_VERSION_INFO VERSIONINFO\r
+ FILEVERSION 0,0,0,1\r
+ PRODUCTVERSION 0,0,0,1\r
+ FILEFLAGSMASK 0x17L\r
+#ifdef _DEBUG\r
+ FILEFLAGS 0x1L\r
+#else\r
+ FILEFLAGS 0x0L\r
+#endif\r
+ FILEOS 0x4L\r
+ FILETYPE 0x2L\r
+ FILESUBTYPE 0x0L\r
+BEGIN\r
+    BLOCK "StringFileInfo"\r
+    BEGIN\r
+        BLOCK "041104b0"\r
+        BEGIN\r
+            VALUE "CompanyName", "\8cN\89e\91\90\8dH\96["\r
+            VALUE "FileDescription", "\83O\83\8a\83t\89æ\91\9c\82ð\90¶\90¬\82µ\82Ü\82·\81B"\r
+            VALUE "FileVersion", "0, 0, 0, 1"\r
+            VALUE "InternalName", "nsdfont"\r
+            VALUE "LegalCopyright", "Copyright (c) 2010, The Kimikage NScripter Plugins Project.  All rights reserved."\r
+            VALUE "OriginalFilename", "nsdfont.dll"\r
+            VALUE "ProductName", "NSD\83t\83H\83\93\83g\83v\83\89\83O\83C\83\93"\r
+            VALUE "ProductVersion", "0, 0, 0, 1"\r
+        END\r
+    END\r
+    BLOCK "VarFileInfo"\r
+    BEGIN\r
+        VALUE "Translation", 0x411, 1200\r
+    END\r
+END\r
+\r
+#endif    // \93ú\96{\8cê resources\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+\r
+\r
+#ifndef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 3 resource.\r
+//\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#endif    // not APSTUDIO_INVOKED\r
+\r

diff --git a/nsdfont/src/resource.h b/nsdfont/src/resource.h
new file mode 100755 (executable)
index 0000000..d31d0e4
--- /dev/null
+++ b/nsdfont/src/resource.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}\r
+// Microsoft Visual C++ generated include file.\r
+// Used by nsdfont.rc\r
+\r
+// \90V\82µ\82¢\83I\83u\83W\83F\83N\83g\82Ì\8e\9f\82Ì\8aù\92è\92l\r
+// \r
+#ifdef APSTUDIO_INVOKED\r
+#ifndef APSTUDIO_READONLY_SYMBOLS\r
+#define _APS_NEXT_RESOURCE_VALUE        101\r
+#define _APS_NEXT_COMMAND_VALUE         40001\r
+#define _APS_NEXT_CONTROL_VALUE         1001\r
+#define _APS_NEXT_SYMED_VALUE           101\r
+#endif\r
+#endif\r

diff --git a/nsdfont/vs2005/nsdfont.vcproj b/nsdfont/vs2005/nsdfont.vcproj
index 83c2076..60e1a69 100755 (executable)
--- a/nsdfont/vs2005/nsdfont.vcproj
+++ b/nsdfont/vs2005/nsdfont.vcproj
@@ -191,6 +191,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\common\src\license.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\src\main.cpp"\r
                                >\r
                        </File>\r
@@ -241,6 +245,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath="..\src\resource.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\src\Typesetter.h"\r
                                >\r
                        </File>\r
@@ -254,6 +262,10 @@
                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
                        >\r
+                       <File\r
+                               RelativePath="..\src\nsdfont.rc"\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r