Merge pull request #2 from mattfelsen/0.9.0-vs2015-x64

VS2015 x64 Compatibility

Author: robotconscience

Readme.md

@@ -15,13 +15,13 @@ You will need to install libjpeg-turbo (http://sourceforge.net/projects/libjpeg-
 
 #Compiling
 
-* Visual studio 2015 (instructions by [tgfrerer](https://github.com/tgfrerer))
+* Visual studio 2015 (instructions by [tgfrerer](https://github.com/tgfrerer) and [mattfelsen](https://github.com/mattfelsen))
   * turboJPEG libraries for vs2015 compiled straight off the sources using the following recipe:
-  * download turbojpeg release:
-    http://sourceforge.net/projects/libjpeg-turbo/files/1.4.1/libjpeg-turbo-1.4.1-vc.exe/download
-  * download nasm (net assembler): http://www.nasm.us/pub/nasm/releasebuilds/2.11.08/win32/nasm-2.11.08-installer.exe
-  * copy nasm.exe into the cmake/bin directory so it ends up in the PATH for the cmd prompt.
-  * use cmake-gui and cmake to build visual studio project files, compile turbojpeg
-  * find turbojpeg-static.lib and it's debug counterpart.
-  * rename the debug .lib to turbojpeg-staticd.lib (note the 'd' for last character)
-  * copy both lib files into the lib folder in the ofxTurboJpeg addon.
+  * download [turbojpeg source v1.4.1](http://sourceforge.net/projects/libjpeg-turbo/files/1.4.1/libjpeg-turbo-1.4.1.tar.gz/download)
+  * download [nasm (net assembler)](http://www.nasm.us/pub/nasm/releasebuilds/2.11.08/win32/nasm-2.11.08-installer.exe)
+  * add `nasm.exe` to your `%PATH%` environment variable
+    * this depends on where you installed nasm, but should be something like `C:\Users\YOUR_USERNAME\AppData\Local\nasm`
+    * edit in `Control Panel > System > Advanced system settings > Environment variables > Path`
+  * use `cmake-gui.exe` to build visual studio project files
+  * open and compile `libjpeg-turbo.sln` in `Debug` and `Release` modes
+  * find `turbojpeg-static.lib` in `build\[Debug|Release]` and copy into the proper locations in the ofxTurboJpeg addon

addon_config.mk

@@ -40,7 +40,7 @@ common:
 
 	# some addons need resources to be copied to the bin/data folder of the project
 	# specify here any files that need to be copied, you can use wildcards like * and ?
-	ADDON_DATA = libs/turbo-jpeg/lib/osx/libturbojpeg.dylib	
+	ADDON_DATA = 
 
 	# when parsing the file system looking for libraries exclude this for all or
 	# a specific platform
@@ -73,7 +73,17 @@ vs:
 	# when parsing the file system looking for include paths exclude this for all or
 	# a specific platform
 	ADDON_INCLUDES_EXCLUDE
-	ADDON_LIBS = libs/turbo-jpeg/lib/win32/turbojpeg-static.lib
+
+	# These should get automatically set up by the projectGenerator. If you're adding
+	# to a project manually, use the following pattern:
+	# Win32/Debug
+	# ADDON_LIBS = libs/libwebsockets/lib/vs/Win32/Debug/turbojpeg-static.lib
+	# Win32/Release
+	# ADDON_LIBS = libs/libwebsockets/lib/vs/Win32/Release/turbojpeg-static.lib
+	# x64/Debug 
+	# ADDON_LIBS = libs/libwebsockets/lib/vs/x64/Debug/turbojpeg-static.lib
+	# x64/Release 
+	# ADDON_LIBS = libs/libwebsockets/lib/vs/x64/Release/turbojpeg-static.lib
 
 linuxarmv6l:
 	ADDON_LDFLAGS = 
@@ -88,4 +98,5 @@ android/armeabi-v7a:
 	#nothing yet
 
 osx:
+	ADDON_DATA = libs/turbo-jpeg/lib/osx/libturbojpeg.dylib	
 	ADDON_LDFLAGS = ../../../addons/ofxTurboJpeg/libs/turbo-jpeg/lib/osx/libturbojpeg.dylib	

example/example.sln

@@ -1,23 +1,33 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 14
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcxproj", "{7FD42DF7-442E-479A-BA76-D0022F99702A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openframeworksLib", "..\..\..\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj", "{5837595D-ACA9-485C-8E76-729040CE4B0B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|Win32.Build.0 = Debug|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.ActiveCfg = Debug|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Debug|x64.Build.0 = Debug|x64
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.ActiveCfg = Release|Win32
 		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|Win32.Build.0 = Release|Win32
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.ActiveCfg = Release|x64
+		{7FD42DF7-442E-479A-BA76-D0022F99702A}.Release|x64.Build.0 = Release|x64
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|Win32.Build.0 = Debug|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.ActiveCfg = Debug|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Debug|x64.Build.0 = Debug|x64
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.ActiveCfg = Release|Win32
 		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|Win32.Build.0 = Release|Win32
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.ActiveCfg = Release|x64
+		{5837595D-ACA9-485C-8E76-729040CE4B0B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE