[Pmplib-commits] SF.net SVN: pmplib: [408] trunk/pmplib

[<ny...@us...>]

Revision: 408
          http://svn.sourceforge.net/pmplib/?rev=408&view=rev
Author:   nyaochi
Date:     2007-05-11 19:26:41 -0700 (Fri, 11 May 2007)

Log Message:
-----------
- Make easypmp_cui work again on Win32 environments.
- Minor bug fix.

Modified Paths:
--------------
    trunk/pmplib/frontend/easypmp/cui/easypmp_cui.vcproj
    trunk/pmplib/lib/gmi/gmi.vcproj
    trunk/pmplib/lib/pmp_ipod/ipod.c
    trunk/pmplib/lib/pmp_ipod/pmp_ipod.vcproj

Added Paths:
-----------
    trunk/pmplib/include/win32/
    trunk/pmplib/include/win32/config.h

Modified: trunk/pmplib/frontend/easypmp/cui/easypmp_cui.vcproj
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/easypmp_cui.vcproj	2007-05-12 01:28:22 UTC (rev 407)
+++ trunk/pmplib/frontend/easypmp/cui/easypmp_cui.vcproj	2007-05-12 02:26:41 UTC (rev 408)
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)include,..\common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="$(SolutionDir)include\win32,$(SolutionDir)include,..\common"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -119,8 +119,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)include,..\common"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				AdditionalIncludeDirectories="$(SolutionDir)include\win32,$(SolutionDir)include,..\common"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"

Added: trunk/pmplib/include/win32/config.h
===================================================================
--- trunk/pmplib/include/win32/config.h	                        (rev 0)
+++ trunk/pmplib/include/win32/config.h	2007-05-12 02:26:41 UTC (rev 408)
@@ -0,0 +1,6 @@
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+
+#define	HAVE_MP4V2	1
+
+#endif/*__CONFIG_H__*/


Property changes on: trunk/pmplib/include/win32/config.h
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Modified: trunk/pmplib/lib/gmi/gmi.vcproj
===================================================================
--- trunk/pmplib/lib/gmi/gmi.vcproj	2007-05-12 01:28:22 UTC (rev 407)
+++ trunk/pmplib/lib/gmi/gmi.vcproj	2007-05-12 02:26:41 UTC (rev 408)
@@ -41,8 +41,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)include,contrib,contrib\id3tag,contrib\mp4v2"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GMI_EXPORTS"
+				AdditionalIncludeDirectories="$(SolutionDir)include\win32,$(SolutionDir)include,contrib,contrib\id3tag,contrib\mp4v2"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GMI_EXPORTS;HAVE_CONFIG_H"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -121,8 +121,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)include,contrib,contrib\id3tag"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GMI_EXPORTS"
+				AdditionalIncludeDirectories="$(SolutionDir)include\win32,$(SolutionDir)include,contrib,contrib\id3tag,contrib\mp4v2"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GMI_EXPORTS;HAVE_CONFIG_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -140,7 +140,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies=".\contrib\id3tag\win32\libid3tag.lib .\contrib\id3tag\win32\zlib.lib .\contrib\ogg\win32\ogg_static.lib .\contrib\vorbis\win32\vorbis_static.lib .\contrib\vorbis\win32\vorbisfile_static.lib"
+				AdditionalDependencies=".\contrib\id3tag\win32\libid3tag.lib .\contrib\id3tag\win32\zlib.lib .\contrib\ogg\win32\ogg_static.lib .\contrib\vorbis\win32\vorbis_static.lib .\contrib\vorbis\win32\vorbisfile_static.lib .\contrib\mp4v2\win32\libmp4v260.lib"
 				OutputFile="$(OutDir)/gmi.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

Modified: trunk/pmplib/lib/pmp_ipod/ipod.c
===================================================================
--- trunk/pmplib/lib/pmp_ipod/ipod.c	2007-05-12 01:28:22 UTC (rev 407)
+++ trunk/pmplib/lib/pmp_ipod/ipod.c	2007-05-12 02:26:41 UTC (rev 408)
@@ -659,7 +659,7 @@
 	/* */
 	for (i = 0;i < num_records;++i) {
 		mhip = itunesdb_new_child(mhyp);
-		if (!mhip) {
+		if (mhip) {
 			chunk_mhip_t* mhip_data = NULL;
 			if (ret = itunesdb_init(mhip, "mhip", NULL)) return ret;
 			mhip_data = (chunk_mhip_t*)mhip->data;

Modified: trunk/pmplib/lib/pmp_ipod/pmp_ipod.vcproj
===================================================================
--- trunk/pmplib/lib/pmp_ipod/pmp_ipod.vcproj	2007-05-12 01:28:22 UTC (rev 407)
+++ trunk/pmplib/lib/pmp_ipod/pmp_ipod.vcproj	2007-05-12 02:26:41 UTC (rev 408)
@@ -136,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies=".\win32spti\ipodprop_win32spti.lib shlwapi.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.