From: yukihane <yukihane.feather@gmail.com>
Date: Thu, 22 Sep 2011 10:18:30 +0000 (+0900)
Subject: Merge branch 'master' of git.sourceforge.jp:/gitroot/coroid/inqubus
X-Git-Tag: rel20110922_ver2.1.0~4
X-Git-Url: http://git.sourceforge.jp/view?p=coroid%2Finqubus.git;a=commitdiff_plain;h=809575cea4e608a759c285432468bbaaaf057e1f;hp=0b9a11562962f903a0c5ed287e902ae4cc65658c

Merge branch 'master' of git.sourceforge.jp:/gitroot/coroid/inqubus
---

diff --git a/binaries/libnicovideo.so b/binaries/libnicovideo.so
new file mode 100755
index 0000000..bd75d7d
Binary files /dev/null and b/binaries/libnicovideo.so differ
diff --git a/binaries/libnicovideo.so.1.0.0 b/binaries/libnicovideo.so.1.0.0
deleted file mode 100644
index e85b8d6..0000000
Binary files a/binaries/libnicovideo.so.1.0.0 and /dev/null differ
diff --git a/vhook/nbproject/Makefile-LinuxReleaseOnLinux.mk b/vhook/nbproject/Makefile-LinuxReleaseOnLinux.mk
index fdc1923..1587d84 100644
--- a/vhook/nbproject/Makefile-LinuxReleaseOnLinux.mk
+++ b/vhook/nbproject/Makefile-LinuxReleaseOnLinux.mk
@@ -60,11 +60,11 @@ LDLIBSOPTIONS=-L/home/yuki/fflibs/lib -lSDL_gfx -lSDLmain -lSDL -lSDL_ttf
 
 # Build Targets
 .build-conf: ${BUILD_SUBPROJECTS}
-	${MAKE}  -f nbproject/Makefile-LinuxReleaseOnLinux.mk dist/Release/GNU-Linux-x86/libnicovideo.so.1.0.0
+	${MAKE}  -f nbproject/Makefile-LinuxReleaseOnLinux.mk dist/Release/GNU-Linux-x86/libnicovideo.so
 
-dist/Release/GNU-Linux-x86/libnicovideo.so.1.0.0: ${OBJECTFILES}
+dist/Release/GNU-Linux-x86/libnicovideo.so: ${OBJECTFILES}
 	${MKDIR} -p dist/Release/GNU-Linux-x86
-	${LINK.c} -shared -o dist/Release/${CND_PLATFORM}/libnicovideo.so.1.0.0 -s -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS} 
+	${LINK.c} -shared -o dist/Release/${CND_PLATFORM}/libnicovideo.so -s -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS} 
 
 ${OBJECTDIR}/comment/com_surface.o: nbproject/Makefile-${CND_CONF}.mk comment/com_surface.c 
 	${MKDIR} -p ${OBJECTDIR}/comment
@@ -122,7 +122,7 @@ ${OBJECTDIR}/util.o: nbproject/Makefile-${CND_CONF}.mk util.c
 # Clean Targets
 .clean-conf: ${CLEAN_SUBPROJECTS}
 	${RM} -r build/LinuxReleaseOnLinux
-	${RM} dist/Release/GNU-Linux-x86/libnicovideo.so.1.0.0
+	${RM} dist/Release/GNU-Linux-x86/libnicovideo.so
 
 # Subprojects
 .clean-subprojects:
diff --git a/vhook/nbproject/Makefile-variables.mk b/vhook/nbproject/Makefile-variables.mk
index 8810dc1..c0c400e 100644
--- a/vhook/nbproject/Makefile-variables.mk
+++ b/vhook/nbproject/Makefile-variables.mk
@@ -17,8 +17,8 @@ CND_PACKAGE_PATH_Debug=dist/Debug//package/libvhook.dll.tar
 # LinuxReleaseOnLinux configuration
 CND_PLATFORM_LinuxReleaseOnLinux=GNU-Linux-x86
 CND_ARTIFACT_DIR_LinuxReleaseOnLinux=dist/Release/GNU-Linux-x86
-CND_ARTIFACT_NAME_LinuxReleaseOnLinux=libnicovideo.so.1.0.0
-CND_ARTIFACT_PATH_LinuxReleaseOnLinux=dist/Release/GNU-Linux-x86/libnicovideo.so.1.0.0
+CND_ARTIFACT_NAME_LinuxReleaseOnLinux=libnicovideo.so
+CND_ARTIFACT_PATH_LinuxReleaseOnLinux=dist/Release/GNU-Linux-x86/libnicovideo.so
 CND_PACKAGE_DIR_LinuxReleaseOnLinux=dist/LinuxReleaseOnLinux/GNU-Linux-x86/package
 CND_PACKAGE_NAME_LinuxReleaseOnLinux=libvhook.so.tar
 CND_PACKAGE_PATH_LinuxReleaseOnLinux=dist/LinuxReleaseOnLinux/GNU-Linux-x86/package/libvhook.so.tar
diff --git a/vhook/nbproject/Package-LinuxReleaseOnLinux.bash b/vhook/nbproject/Package-LinuxReleaseOnLinux.bash
index e980018..cf70ab2 100644
--- a/vhook/nbproject/Package-LinuxReleaseOnLinux.bash
+++ b/vhook/nbproject/Package-LinuxReleaseOnLinux.bash
@@ -11,8 +11,8 @@ CND_CONF=LinuxReleaseOnLinux
 CND_DISTDIR=dist
 TMPDIR=build/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=dist/Release/${CND_PLATFORM}/libnicovideo.so.1.0.0
-OUTPUT_BASENAME=libnicovideo.so.1.0.0
+OUTPUT_PATH=dist/Release/${CND_PLATFORM}/libnicovideo.so
+OUTPUT_BASENAME=libnicovideo.so
 PACKAGE_TOP_DIR=libvhook.so/
 
 # Functions
diff --git a/vhook/nbproject/configurations.xml b/vhook/nbproject/configurations.xml
index 9eec141..c0ce253 100644
--- a/vhook/nbproject/configurations.xml
+++ b/vhook/nbproject/configurations.xml
@@ -89,7 +89,7 @@
           <developmentMode>5</developmentMode>
         </fortranCompilerTool>
         <linkerTool>
-          <output>dist/Release/${CND_PLATFORM}/libnicovideo.so.1.0.0</output>
+          <output>dist/Release/${CND_PLATFORM}/libnicovideo.so</output>
           <linkerAddLib>
             <pElem>/home/yuki/fflibs/lib</pElem>
           </linkerAddLib>