[Pmplib-commits] SF.net SVN: pmplib: [35] trunk/lib/playlist

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

Revision: 35
Author:   nyaochi
Date:     2006-06-03 18:06:17 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=35&view=rev

Log Message:
-----------
- Fixed Win32 build
- A symbol indicating the build environment must be defined before '#include <jsapi.h>'

Modified Paths:
--------------
    trunk/lib/playlist/jspl.c
    trunk/lib/playlist/playlist.vcproj
Modified: trunk/lib/playlist/jspl.c
===================================================================
--- trunk/lib/playlist/jspl.c	2006-06-03 23:57:29 UTC (rev 34)
+++ trunk/lib/playlist/jspl.c	2006-06-04 01:06:17 UTC (rev 35)
@@ -37,17 +37,7 @@
 #include <pmp.h>
 #include <playlist.h>
 
-#ifdef USE_INTERNAL_SMJS
-// Build against the in-tree copy of SMJS on Windows.
-#define	XP_WIN
-#include <js/jsapi.h>
-#else
-/* Build against external Javascript library headers.
-   XP_UNIX is already defined if we found them by pkgconfig, 
-   but #define here just in case we didn't... */
-#define XP_UNIX
 #include <jsapi.h>
-#endif
 
 #define	MAX_SOURCE_DEPTH	64
 

Modified: trunk/lib/playlist/playlist.vcproj
===================================================================
--- trunk/lib/playlist/playlist.vcproj	2006-06-03 23:57:29 UTC (rev 34)
+++ trunk/lib/playlist/playlist.vcproj	2006-06-04 01:06:17 UTC (rev 35)
@@ -19,8 +19,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)include,.\contrib"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLAYLIST_EXPORTS"
+				AdditionalIncludeDirectories="$(SolutionDir)include,.\contrib\js"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PLAYLIST_EXPORTS;XP_WIN"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -69,8 +69,8 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)include,.\contrib"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLAYLIST_EXPORTS"
+				AdditionalIncludeDirectories="$(SolutionDir)include,.\contrib\js"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLAYLIST_EXPORTS;XP_WIN"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"


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