From 040a64dfea31a3af365feef4945af91a091d77b4 Mon Sep 17 00:00:00 2001 From: yukihane Date: Wed, 3 Aug 2011 19:23:34 +0900 Subject: [PATCH] =?utf8?q?Linux=20Mingw=20=E3=83=93=E3=83=AB=E3=83=89?= =?utf8?q?=E7=94=A8=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ...efile-Linux_Debug.mk => Makefile-LinuxMingw.mk} | 46 +++++++++++----------- vhook/nbproject/Makefile-impl.mk | 2 +- vhook/nbproject/Makefile-variables.mk | 16 ++++---- ...ge-Linux_Debug.bash => Package-LinuxMingw.bash} | 8 ++-- vhook/nbproject/configurations.xml | 20 ++++++++-- 5 files changed, 53 insertions(+), 39 deletions(-) rename vhook/nbproject/{Makefile-Linux_Debug.mk => Makefile-LinuxMingw.mk} (61%) rename vhook/nbproject/{Package-Linux_Debug.bash => Package-LinuxMingw.bash} (89%) diff --git a/vhook/nbproject/Makefile-Linux_Debug.mk b/vhook/nbproject/Makefile-LinuxMingw.mk similarity index 61% rename from vhook/nbproject/Makefile-Linux_Debug.mk rename to vhook/nbproject/Makefile-LinuxMingw.mk index 86e5611..d5d3d1e 100644 --- a/vhook/nbproject/Makefile-Linux_Debug.mk +++ b/vhook/nbproject/Makefile-LinuxMingw.mk @@ -12,15 +12,15 @@ MKDIR=mkdir CP=cp CCADMIN=CCadmin RANLIB=ranlib -CC=gcc -CCC= -CXX= +CC=i586-mingw32msvc-gcc +CCC=i586-mingw32msvc-g++ +CXX=i586-mingw32msvc-g++ FC= -AS=as +AS=i586-mingw32msvc-as # Macros -CND_PLATFORM=GNU-Linux-x86 -CND_CONF=Linux_Debug +CND_PLATFORM=Linx_Mingw-Linux-x86 +CND_CONF=LinuxMingw CND_DISTDIR=dist # Include project Makefile @@ -56,73 +56,73 @@ FFLAGS= ASFLAGS= # Link Libraries and Options -LDLIBSOPTIONS=-L/media/sdb1/home/yuki/fflibs/lib +LDLIBSOPTIONS=-L/mingw/lib -lSDL_gfx -lSDLmain -lSDL -lSDL_ttf # Build Targets .build-conf: ${BUILD_SUBPROJECTS} - ${MAKE} -f nbproject/Makefile-Linux_Debug.mk dist/Linux_Debug/GNU-Linux-x86/libvhook.so + ${MAKE} -f nbproject/Makefile-LinuxMingw.mk dist/LinuxMingw/Linx_Mingw-Linux-x86/nicovideo.dll -dist/Linux_Debug/GNU-Linux-x86/libvhook.so: ${OBJECTFILES} - ${MKDIR} -p dist/Linux_Debug/GNU-Linux-x86 - ${LINK.c} -shared -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libvhook.so -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS} +dist/LinuxMingw/Linx_Mingw-Linux-x86/nicovideo.dll: ${OBJECTFILES} + ${MKDIR} -p dist/LinuxMingw/Linx_Mingw-Linux-x86 + ${LINK.c} -shared -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/nicovideo.dll -s ${OBJECTFILES} ${LDLIBSOPTIONS} ${OBJECTDIR}/comment/com_surface.o: nbproject/Makefile-${CND_CONF}.mk comment/com_surface.c ${MKDIR} -p ${OBJECTDIR}/comment ${RM} $@.d - $(COMPILE.c) -g -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/com_surface.o comment/com_surface.c + $(COMPILE.c) -O3 -s -I/mingw/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/com_surface.o comment/com_surface.c ${OBJECTDIR}/chat/process_chat.o: nbproject/Makefile-${CND_CONF}.mk chat/process_chat.c ${MKDIR} -p ${OBJECTDIR}/chat ${RM} $@.d - $(COMPILE.c) -g -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/process_chat.o chat/process_chat.c + $(COMPILE.c) -O3 -s -I/mingw/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/process_chat.o chat/process_chat.c ${OBJECTDIR}/main.o: nbproject/Makefile-${CND_CONF}.mk main.c ${MKDIR} -p ${OBJECTDIR} ${RM} $@.d - $(COMPILE.c) -g -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/main.o main.c + $(COMPILE.c) -O3 -s -I/mingw/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/main.o main.c ${OBJECTDIR}/framehook.o: nbproject/Makefile-${CND_CONF}.mk framehook.c ${MKDIR} -p ${OBJECTDIR} ${RM} $@.d - $(COMPILE.c) -g -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/framehook.o framehook.c + $(COMPILE.c) -O3 -s -I/mingw/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/framehook.o framehook.c ${OBJECTDIR}/comment/surf_util.o: nbproject/Makefile-${CND_CONF}.mk comment/surf_util.c ${MKDIR} -p ${OBJECTDIR}/comment ${RM} $@.d - $(COMPILE.c) -g -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/surf_util.o comment/surf_util.c + $(COMPILE.c) -O3 -s -I/mingw/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/surf_util.o comment/surf_util.c ${OBJECTDIR}/chat/chat.o: nbproject/Makefile-${CND_CONF}.mk chat/chat.c ${MKDIR} -p ${OBJECTDIR}/chat ${RM} $@.d - $(COMPILE.c) -g -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat.o chat/chat.c + $(COMPILE.c) -O3 -s -I/mingw/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat.o chat/chat.c ${OBJECTDIR}/comment/shadow.o: nbproject/Makefile-${CND_CONF}.mk comment/shadow.c ${MKDIR} -p ${OBJECTDIR}/comment ${RM} $@.d - $(COMPILE.c) -g -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/shadow.o comment/shadow.c + $(COMPILE.c) -O3 -s -I/mingw/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/comment/shadow.o comment/shadow.c ${OBJECTDIR}/chat/chat_slot.o: nbproject/Makefile-${CND_CONF}.mk chat/chat_slot.c ${MKDIR} -p ${OBJECTDIR}/chat ${RM} $@.d - $(COMPILE.c) -g -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat_slot.o chat/chat_slot.c + $(COMPILE.c) -O3 -s -I/mingw/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/chat/chat_slot.o chat/chat_slot.c ${OBJECTDIR}/process.o: nbproject/Makefile-${CND_CONF}.mk process.c ${MKDIR} -p ${OBJECTDIR} ${RM} $@.d - $(COMPILE.c) -g -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/process.o process.c + $(COMPILE.c) -O3 -s -I/mingw/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/process.o process.c ${OBJECTDIR}/util.o: nbproject/Makefile-${CND_CONF}.mk util.c ${MKDIR} -p ${OBJECTDIR} ${RM} $@.d - $(COMPILE.c) -g -fPIC -MMD -MP -MF $@.d -o ${OBJECTDIR}/util.o util.c + $(COMPILE.c) -O3 -s -I/mingw/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/util.o util.c # Subprojects .build-subprojects: # Clean Targets .clean-conf: ${CLEAN_SUBPROJECTS} - ${RM} -r build/Linux_Debug - ${RM} dist/Linux_Debug/GNU-Linux-x86/libvhook.so + ${RM} -r build/LinuxMingw + ${RM} dist/LinuxMingw/Linx_Mingw-Linux-x86/nicovideo.dll # Subprojects .clean-subprojects: diff --git a/vhook/nbproject/Makefile-impl.mk b/vhook/nbproject/Makefile-impl.mk index 54c9b1b..931d1e6 100644 --- a/vhook/nbproject/Makefile-impl.mk +++ b/vhook/nbproject/Makefile-impl.mk @@ -31,7 +31,7 @@ DEFAULTCONF=Debug CONF=${DEFAULTCONF} # All Configurations -ALLCONFS=Debug Release Linux_Debug +ALLCONFS=Debug Release LinuxMingw # build diff --git a/vhook/nbproject/Makefile-variables.mk b/vhook/nbproject/Makefile-variables.mk index bcff29f..57296a4 100644 --- a/vhook/nbproject/Makefile-variables.mk +++ b/vhook/nbproject/Makefile-variables.mk @@ -22,11 +22,11 @@ CND_ARTIFACT_PATH_Release=dist/Release//nicovideo.dll CND_PACKAGE_DIR_Release=dist/Release//package CND_PACKAGE_NAME_Release=libvhook.dll.tar CND_PACKAGE_PATH_Release=dist/Release//package/libvhook.dll.tar -# Linux_Debug configuration -CND_PLATFORM_Linux_Debug=GNU-Linux-x86 -CND_ARTIFACT_DIR_Linux_Debug=dist/Linux_Debug/GNU-Linux-x86 -CND_ARTIFACT_NAME_Linux_Debug=libvhook.so -CND_ARTIFACT_PATH_Linux_Debug=dist/Linux_Debug/GNU-Linux-x86/libvhook.so -CND_PACKAGE_DIR_Linux_Debug=dist/Linux_Debug/GNU-Linux-x86/package -CND_PACKAGE_NAME_Linux_Debug=libvhook.so.tar -CND_PACKAGE_PATH_Linux_Debug=dist/Linux_Debug/GNU-Linux-x86/package/libvhook.so.tar +# LinuxMingw configuration +CND_PLATFORM_LinuxMingw=Linx_Mingw-Linux-x86 +CND_ARTIFACT_DIR_LinuxMingw=dist/LinuxMingw/Linx_Mingw-Linux-x86 +CND_ARTIFACT_NAME_LinuxMingw=nicovideo.dll +CND_ARTIFACT_PATH_LinuxMingw=dist/LinuxMingw/Linx_Mingw-Linux-x86/nicovideo.dll +CND_PACKAGE_DIR_LinuxMingw=dist/LinuxMingw/Linx_Mingw-Linux-x86/package +CND_PACKAGE_NAME_LinuxMingw=libvhook.so.tar +CND_PACKAGE_PATH_LinuxMingw=dist/LinuxMingw/Linx_Mingw-Linux-x86/package/libvhook.so.tar diff --git a/vhook/nbproject/Package-Linux_Debug.bash b/vhook/nbproject/Package-LinuxMingw.bash similarity index 89% rename from vhook/nbproject/Package-Linux_Debug.bash rename to vhook/nbproject/Package-LinuxMingw.bash index 8d0a39e..4bf35d5 100644 --- a/vhook/nbproject/Package-Linux_Debug.bash +++ b/vhook/nbproject/Package-LinuxMingw.bash @@ -6,13 +6,13 @@ # Macros TOP=`pwd` -CND_PLATFORM=GNU-Linux-x86 -CND_CONF=Linux_Debug +CND_PLATFORM=Linx_Mingw-Linux-x86 +CND_CONF=LinuxMingw CND_DISTDIR=dist TMPDIR=build/${CND_CONF}/${CND_PLATFORM}/tmp-packaging TMPDIRNAME=tmp-packaging -OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/libvhook.so -OUTPUT_BASENAME=libvhook.so +OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/nicovideo.dll +OUTPUT_BASENAME=nicovideo.dll PACKAGE_TOP_DIR=libvhook.so/ # Functions diff --git a/vhook/nbproject/configurations.xml b/vhook/nbproject/configurations.xml index 1dbabef..9b81cf8 100644 --- a/vhook/nbproject/configurations.xml +++ b/vhook/nbproject/configurations.xml @@ -97,18 +97,32 @@ - + localhost - GNU|GNU + Linx_Mingw|GNU 2 + + 6 + true + + /mingw/include + + + ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/nicovideo.dll - /media/sdb1/home/yuki/fflibs/lib + /mingw/lib + true + false + SDL_gfx + SDLmain + SDL + SDL_ttf -- 2.11.0