From 2a54d18eb533debb6bd7330b4782c7524318443a Mon Sep 17 00:00:00 2001 From: yukihane Date: Thu, 22 Sep 2011 19:15:47 +0900 Subject: [PATCH] =?utf8?q?Linux=E7=94=A8libnicovideo.so=E3=81=AE=E3=83=93?= =?utf8?q?=E3=83=AB=E3=83=89=E6=99=82=E5=87=BA=E5=8A=9B=E3=83=95=E3=82=A1?= =?utf8?q?=E3=82=A4=E3=83=AB=E5=90=8D=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- vhook/nbproject/Makefile-LinuxReleaseOnLinux.mk | 8 ++++---- vhook/nbproject/Makefile-variables.mk | 4 ++-- vhook/nbproject/Package-LinuxReleaseOnLinux.bash | 4 ++-- vhook/nbproject/configurations.xml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) 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 @@ 5 - dist/Release/${CND_PLATFORM}/libnicovideo.so.1.0.0 + dist/Release/${CND_PLATFORM}/libnicovideo.so /home/yuki/fflibs/lib -- 2.11.0