# HG changeset patch # User Jeep-Tour@Jeep-Tour-PC # Date 1343060870 14400 # Node ID 4978b5baf8f159d6c6b602a9fb9efbfdbf97af29 # Parent 571ba5ed22e2d55e12ae5d6c9eb8085e3cfbf531 Win32 version for traffic intelligence. Use the README-Win32.txt to know how to fetch the dependencies. A batch file is included to automate most of the process diff -r 571ba5ed22e2 -r 4978b5baf8f1 .hgignore --- a/.hgignore Wed Jul 18 02:54:22 2012 -0400 +++ b/.hgignore Mon Jul 23 12:27:50 2012 -0400 @@ -4,7 +4,6 @@ *.out *.a *.o -*.exe *.pyc *.pyo *~ @@ -14,6 +13,11 @@ *.lock *.yml *.zip +*.opensdf +*.sdf +*.suo +*.user +*.filters .emacs.desktop* CMakeCache.txt @@ -23,4 +27,5 @@ html bin build -CMakeFiles \ No newline at end of file +CMakeFiles +ipch \ No newline at end of file diff -r 571ba5ed22e2 -r 4978b5baf8f1 OpenCV.props --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/OpenCV.props Mon Jul 23 12:27:50 2012 -0400 @@ -0,0 +1,20 @@ + + + + + d + + + + + + + $(SolutionDir)\win32-depends\opencv\include\opencv2\;$(SolutionDir)\win32-depends\opencv\include\opencv\;$(SolutionDir)\win32-depends\opencv\include\;%(AdditionalIncludeDirectories) + + + $(SolutionDir)\win32-depends\opencv\libs\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + opencv_video242$(DebugSuffix).lib;opencv_ts242$(DebugSuffix).lib;opencv_objdetect242$(DebugSuffix).lib;opencv_ml242$(DebugSuffix).lib;opencv_legacy242$(DebugSuffix).lib;opencv_imgproc242$(DebugSuffix).lib;opencv_highgui242$(DebugSuffix).lib;opencv_flann242$(DebugSuffix).lib;opencv_features2d242$(DebugSuffix).lib;opencv_core242$(DebugSuffix).lib;opencv_contrib242$(DebugSuffix).lib;opencv_calib3d242$(DebugSuffix).lib;%(AdditionalDependencies) + + + + \ No newline at end of file diff -r 571ba5ed22e2 -r 4978b5baf8f1 README-Win32.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README-Win32.txt Mon Jul 23 12:27:50 2012 -0400 @@ -0,0 +1,22 @@ +To be able to use traffic intelligence on windows, you will first have to fetch the 3rd party libraries. +To do this, go in the folder win32-depends and launch win32-depends-installer.bat. It should fetch the library +and unarchive them correctly. + +Second you will need is the project TrajectoryManagementAndAnalysis available at https://bitbucket.org/trajectories/trajectorymanagementandanalysis + + + +If you want the sln to work, the project must be in the same folder where you have cloned trafficintelligence. +To clone the project, use hg clone https://bitbucket.org/trajectories/trajectorymanagementandanalysis + +If you've done everything correctly, you should have + +/trafficintelligence +/trafficintelligence/win32-depends/boost/ +/trafficintelligence/win32-depends/klt/ +/trafficintelligence/win32-depends/opencv/ +/trafficintelligence/win32-depends/sqlite/ +/trajectorymanagementandanalysis + + + diff -r 571ba5ed22e2 -r 4978b5baf8f1 boost.props --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/boost.props Mon Jul 23 12:27:50 2012 -0400 @@ -0,0 +1,15 @@ + + + + + + + + $(SolutionDir)\win32-depends\boost\include\;%(AdditionalIncludeDirectories) + + + $(SolutionDir)\win32-depends\boost\libs\$(PlatformName)\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + + + + \ No newline at end of file diff -r 571ba5ed22e2 -r 4978b5baf8f1 klt.props --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/klt.props Mon Jul 23 12:27:50 2012 -0400 @@ -0,0 +1,12 @@ + + + + + + + + $(SolutionDir)\win32-depends\klt\include\;%(AdditionalIncludeDirectories) + + + + \ No newline at end of file diff -r 571ba5ed22e2 -r 4978b5baf8f1 sqlite.props --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sqlite.props Mon Jul 23 12:27:50 2012 -0400 @@ -0,0 +1,16 @@ + + + + + + + + $(SolutionDir)\win32-depends\sqlite\include\;%(AdditionalIncludeDirectories) + + + sqlite3.lib;%(AdditionalDependencies) + $(SolutionDir)\win32-depends\sqlite\libs\$(ConfigurationName)\;%(AdditionalLibraryDirectories) + + + + \ No newline at end of file diff -r 571ba5ed22e2 -r 4978b5baf8f1 trafficintelligence.sln --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/trafficintelligence.sln Mon Jul 23 12:27:50 2012 -0400 @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "trafficintelligence", "trafficintelligence.vcxproj", "{70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}.Debug|Win32.ActiveCfg = Debug|Win32 + {70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}.Debug|Win32.Build.0 = Debug|Win32 + {70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}.Release|Win32.ActiveCfg = Release|Win32 + {70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -r 571ba5ed22e2 -r 4978b5baf8f1 trafficintelligence.vcxproj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/trafficintelligence.vcxproj Mon Jul 23 12:27:50 2012 -0400 @@ -0,0 +1,125 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + + + + + + + + + + + + + + + + + {70E43B7B-A3DA-40AD-A0D3-24758BA3FC42} + Win32Proj + trafficintelligence + + + + Application + true + Unicode + + + Application + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)\bin\$(Configuration)\ + $(SolutionDir)\bin\$(Configuration)\ + + + false + $(SolutionDir)\bin\$(Configuration)\ + $(SolutionDir)\bin\$(Configuration)\ + + + + + + Level3 + Disabled + WIN32;USE_OPENCV;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)\include\;%(AdditionalIncludeDirectories) + + + MultiThreadedDebugDLL + + + Console + true + + + xcopy /Y /Q /D $(SolutionDir)\win32-depends\sqlite\bin\sqlite3.dll $(OutDir) +xcopy /Y /Q /D $(SolutionDir)\win32-depends\opencv\bin\$(PlatformName)\$(ConfigurationName)\*.dll $(OutDir) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;USE_OPENCV;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + $(SolutionDir)\include\;%(AdditionalIncludeDirectories) + MultiThreadedDLL + + + Console + true + true + true + + + xcopy /Y /Q /D $(SolutionDir)\win32-depends\sqlite\bin\sqlite3.dll $(OutDir) +xcopy /Y /Q /D $(SolutionDir)\win32-depends\opencv\bin\$(PlatformName)\$(ConfigurationName)\*.dll $(OutDir) + + + + + + \ No newline at end of file diff -r 571ba5ed22e2 -r 4978b5baf8f1 trajectory.props --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/trajectory.props Mon Jul 23 12:27:50 2012 -0400 @@ -0,0 +1,12 @@ + + + + + + + + $(SolutionDir)\..\trajectorymanagementandanalysis\trunk\src\TrajectoryManagementAndAnalysis\src\;$(SolutionDir)\..\trajectorymanagementandanalysis\trunk\src\TrajectoryManagementAndAnalysis\;%(AdditionalIncludeDirectories) + + + + \ No newline at end of file diff -r 571ba5ed22e2 -r 4978b5baf8f1 win32-depends/.hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/win32-depends/.hgignore Mon Jul 23 12:27:50 2012 -0400 @@ -0,0 +1,35 @@ +# use glob syntax. +syntax: glob + +*.out +*.a +*.o +*.pyc +*.pyo +*~ +*.rej +*.orig +*.bak +*.lock +*.yml +*.zip +*.opensdf +*.sdf +*.suo +*.user +.emacs.desktop* + +CMakeCache.txt +*.cmake + +latex +html +bin +build +CMakeFiles +ipch +boost +klt +opencv +sqlite +win32-depends.zip \ No newline at end of file diff -r 571ba5ed22e2 -r 4978b5baf8f1 win32-depends/7za.exe Binary file win32-depends/7za.exe has changed diff -r 571ba5ed22e2 -r 4978b5baf8f1 win32-depends/wget.exe Binary file win32-depends/wget.exe has changed diff -r 571ba5ed22e2 -r 4978b5baf8f1 win32-depends/win32-depends-installer.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/win32-depends/win32-depends-installer.bat Mon Jul 23 12:27:50 2012 -0400 @@ -0,0 +1,5 @@ +@echo off +cls + +wget https://bitbucket.org/Nicolas/trafficintelligence/downloads/win32-depends.zip +7za x win32-depends.zip \ No newline at end of file