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

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

Revision: 289
          http://svn.sourceforge.net/pmplib/?rev=289&view=rev
Author:   nyaochi
Date:     2007-01-27 01:00:28 -0800 (Sat, 27 Jan 2007)

Log Message:
-----------
- Fixed a bug in filepath_skiproot() for Win32 environment.
- Removed an unnecessary option.
- Make Win32 release build work.

Modified Paths:
--------------
    trunk/pmplib/frontend/easypmp/cui/easypmp_cui.vcproj
    trunk/pmplib/frontend/easypmp/cui/option.c
    trunk/pmplib/lib/filepath/filepath.vcproj
    trunk/pmplib/lib/filepath/filepath_win32.c
    trunk/pmplib/lib/ucs2/ucs2.vcproj

Modified: trunk/pmplib/frontend/easypmp/cui/easypmp_cui.vcproj
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/easypmp_cui.vcproj	2007-01-26 15:59:23 UTC (rev 288)
+++ trunk/pmplib/frontend/easypmp/cui/easypmp_cui.vcproj	2007-01-27 09:00:28 UTC (rev 289)
@@ -120,7 +120,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="$(SolutionDir)include,..\common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"

Modified: trunk/pmplib/frontend/easypmp/cui/option.c
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/option.c	2007-01-26 15:59:23 UTC (rev 288)
+++ trunk/pmplib/frontend/easypmp/cui/option.c	2007-01-27 09:00:28 UTC (rev 289)
@@ -94,7 +94,6 @@
 	fprintf(fp, "  -l, --list-device     Show the list of supported devices and exit\n");
 	fprintf(fp, "  -d, --device          Specify a device identifier for the player\n");
 	fprintf(fp, "  -s, --set=NAME=VALUE  Set a variable NAME to VALUE\n");
-	fprintf(fp, "  -V, --show-variables  Show list of variables and their default values\n");
 	fprintf(fp, "\n");
 #ifndef	_WIN32
 	fprintf(fp, "Language-specific options:\n");
@@ -169,7 +168,6 @@
 			{"list-device",		no_argument,		0, 'l'},
 			{"device",			required_argument,	0, 'd'},
 			{"set",				required_argument,	0, 's'},
-			{"show-variables",	no_argument,		0, 'V'},
 		#ifndef	_WIN32
 			{"encoding",		required_argument,	0, 'e'},
 			{"tagencoding",		required_argument,	0, 'w'},
@@ -244,8 +242,6 @@
 			break;
 		case 's':
 			break;
-		case 'V':
-			break;
 #ifndef	_WIN32
 		case 'e':
 			free(opt->system_encoding);
@@ -253,7 +249,7 @@
 			break;
 		case 'w':
 			free(opt->music_encoding);
-			opt->music_encoding = optarg;
+			opt->music_encoding = strdup(optarg);
 			break;
 #endif/*_WIN32*/
 		case 'v':

Modified: trunk/pmplib/lib/filepath/filepath.vcproj
===================================================================
--- trunk/pmplib/lib/filepath/filepath.vcproj	2007-01-26 15:59:23 UTC (rev 288)
+++ trunk/pmplib/lib/filepath/filepath.vcproj	2007-01-27 09:00:28 UTC (rev 289)
@@ -82,7 +82,7 @@
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)release"
 			IntermediateDirectory="Release"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
@@ -121,23 +121,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/filepath.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/filepath.lib"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -147,12 +136,6 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>

Modified: trunk/pmplib/lib/filepath/filepath_win32.c
===================================================================
--- trunk/pmplib/lib/filepath/filepath_win32.c	2007-01-26 15:59:23 UTC (rev 288)
+++ trunk/pmplib/lib/filepath/filepath_win32.c	2007-01-27 09:00:28 UTC (rev 289)
@@ -101,10 +101,11 @@
 
 const ucs2char_t* filepath_skiproot(const ucs2char_t* path, const ucs2char_t* root)
 {
-	/* Ignore root for WIN32. */
-	const ucs2char_t* p = PathSkipRootW(path);
-	if (!p) p = path;
-	return p;
+	if (ucs2ncmp(path, root, ucs2len(root)) == 0) {
+		return path + ucs2len(root);
+	} else {
+		return path;
+	}
 }
 
 const ucs2char_t* filepath_skippath(const ucs2char_t* path)

Modified: trunk/pmplib/lib/ucs2/ucs2.vcproj
===================================================================
--- trunk/pmplib/lib/ucs2/ucs2.vcproj	2007-01-26 15:59:23 UTC (rev 288)
+++ trunk/pmplib/lib/ucs2/ucs2.vcproj	2007-01-27 09:00:28 UTC (rev 289)
@@ -82,7 +82,7 @@
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)release"
 			IntermediateDirectory="Release"
-			ConfigurationType="2"
+			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
@@ -121,23 +121,12 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/ucs2.dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\ucs2.lib"
-				TargetMachine="1"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
 			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
 				Name="VCXDCMakeTool"
 			/>
 			<Tool
@@ -147,12 +136,6 @@
 				Name="VCFxCopTool"
 			/>
 			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>


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