cpp: vs2015 build

ipaacalib/cpp/CMakeLists.txt

@@ -45,13 +45,13 @@ if(WIN32) # Check if we are on Windows
 		#  On the other hand, if you simply want to use the precompiled rsb from inside
 		#  "rsx" (it works but has no debug info), uncomment the following four lines.
 		#
-		include_directories( ${PROJECT_SOURCE_DIR}/../../../rsx/RSC-0.14.5-win32/include/rsc0.14 )
-		include_directories( ${PROJECT_SOURCE_DIR}/../../../rsx/RSB-0.14.2-win32/include/rsb0.14 )
-		link_directories( ${PROJECT_SOURCE_DIR}/../../../rsx/RSC-0.14.5-win32/lib )
-		link_directories( ${PROJECT_SOURCE_DIR}/../../../rsx/RSB-0.14.2-win32/lib )
+		include_directories( ${PROJECT_SOURCE_DIR}/../../../rsb-win-scs/include/rsc0.14 )
+		include_directories( ${PROJECT_SOURCE_DIR}/../../../rsb-win-scs/include/rsb0.14 )
+		link_directories( ${PROJECT_SOURCE_DIR}/../../../rsb-win-scs/lib )
+		link_directories( ${PROJECT_SOURCE_DIR}/../../../rsb-win-scs/lib )
 		
-		#set(RSBLIBS rsc0.14 rsb0.14)
-		set(RSBLIBS ${PROJECT_SOURCE_DIR}/../../../rsx/RSC-0.14.5-win32/rsc0.14.lib  ${PROJECT_SOURCE_DIR}/../../../rsx/RSB-0.14.2-win32/rsb0.14.lib )
+		set(RSBLIBS rsc0.14 rsb0.14)
+		#set(RSBLIBS ${PROJECT_SOURCE_DIR}/../../../rsx/RSC-0.14.5-win32/rsc0.14.lib  ${PROJECT_SOURCE_DIR}/../../../rsx/RSB-0.14.2-win32/rsb0.14.lib )
 		set(LIBS ${LIBS} rpcrt4)
 
                 set(Boost_USE_STATIC_LIBS ON)

ipaacalib/cpp/build.xml

@@ -11,11 +11,6 @@
    <target name="-proto-no" depends="check-proto-files" unless="pb.present">
       <echo message="Compiling protobuf files" />
       <mkdir dir="${build.dir}/ipaaca" />
-      <exec executable="protoc">
-         <arg value="--proto_path=../proto" />
-         <arg value="../proto/ipaaca.proto" />
-         <arg value="--cpp_out=build/ipaaca/" />
-      </exec>
    </target>
    <target name="-pre-compilation" depends="-proto-yes,-proto-no" />
    <target name="-compilation" depends="-build-setup, -pre-compilation">
@@ -23,6 +18,9 @@
       <cmake srcdir="${cmake.base.dir}"
          bindir="${build.dir}"
          buildtype="Debug">
+         <generator name="Visual Studio 14" platform="windows" buildargs="ALL_BUILD.vcxproj">
+             <variable name="CMAKE_INSTALL_PREFIX" type="PATH" value="../${zip.tmp.dir}" />
+         </generator>
          <generator name="Visual Studio 10" platform="windows" buildargs="ALL_BUILD.vcxproj">
              <variable name="CMAKE_INSTALL_PREFIX" type="PATH" value="../${zip.tmp.dir}" />
          </generator>