r226 - in branches/work_303: . core output

jls17 at arinside.org jls17 at arinside.org
Sun Oct 2 16:18:45 CDT 2011


Author: jls17
Date: Sun Oct  2 16:18:44 2011
New Revision: 226
URL: http://arinside.org/changeset/226

Log:
- version bump to 3.0.3
- now all builds use version 7.6.04 of ARAPI by default
- added precompiled header support to CMakeLists.txt when using MS compiler
- fixed FileNaming.cpp to make compiling using ARAPI 7.0/7.1 possible again

Modified:
   branches/work_303/ARInside.cpp
   branches/work_303/ARInside.vcproj
   branches/work_303/CMakeLists.txt
   branches/work_303/core/AREnum.h
   branches/work_303/output/FileNaming.cpp

Modified: branches/work_303/ARInside.cpp
==============================================================================
--- branches/work_303/ARInside.cpp	Sun Oct  2 14:49:38 2011	(r225)
+++ branches/work_303/ARInside.cpp	Sun Oct  2 16:18:44 2011	(r226)
@@ -57,7 +57,7 @@
 
 /////////
 // version information block
-#define VERSION "3.0.2"
+#define VERSION "3.0.3"
 #if defined(_DEBUG)
 #define VERSION_STR VERSION "." SVN_REV_STR " Debug"
 #elif defined(_ARINSIDE_BETA)

Modified: branches/work_303/ARInside.vcproj
==============================================================================
--- branches/work_303/ARInside.vcproj	Sun Oct  2 14:49:38 2011	(r225)
+++ branches/work_303/ARInside.vcproj	Sun Oct  2 16:18:44 2011	(r226)
@@ -45,7 +45,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\Tclap;..\..\Api750\include;.\;..\..\libs\zlib\include;"
+				AdditionalIncludeDirectories=".\Tclap;..\..\api764sp1\include;.\;..\..\libs\zlib\include;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;AR_STRICT_ANSI;ARINSIDE_ENABLE_ZLIB_SUPPORT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -66,9 +66,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="arapi75.lib arxmlutil75.lib zlibwapi.lib"
+				AdditionalDependencies="arapi7604_build002.lib arxmlutil7604_build002.lib zlibwapi.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\Api750\lib;..\..\libs\zlib\lib"
+				AdditionalLibraryDirectories="..\..\api764sp1\lib;..\..\libs\zlib\lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				LargeAddressAware="2"
@@ -366,7 +366,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories=".\tclap;..\..\Api750\include;.\;..\..\libs\zlib\include"
+				AdditionalIncludeDirectories=".\tclap;..\..\api764sp1\include;.\;..\..\libs\zlib\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_ARINSIDE_BETA;AR_STRICT_ANSI;ARINSIDE_ENABLE_ZLIB_SUPPORT"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -385,9 +385,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="arapi75.lib arxmlutil75.lib zlibwapi.lib"
+				AdditionalDependencies="arapi7604_build002.lib arxmlutil7604_build002.lib zlibwapi.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\Api750\lib;..\..\libs\zlib\lib"
+				AdditionalLibraryDirectories="..\..\Api764sp1\lib;..\..\libs\zlib\lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				LargeAddressAware="2"

Modified: branches/work_303/CMakeLists.txt
==============================================================================
--- branches/work_303/CMakeLists.txt	Sun Oct  2 14:49:38 2011	(r225)
+++ branches/work_303/CMakeLists.txt	Sun Oct  2 16:18:44 2011	(r226)
@@ -24,6 +24,28 @@
 
 MESSAGE(STATUS "System Name: ${CMAKE_SYSTEM_NAME}")
 
+## *** taken from http://stackoverflow.com/questions/148570/using-pre-compiled-headers-with-cmake ***
+## To use it, the PrecompiledSource file shouldn't be specified in SourceVar array. Otherwise the
+## file specific precompiled properties will get overwritten.
+MACRO(ADD_MSVC_PRECOMPILED_HEADER PrecompiledHeader PrecompiledSource SourcesVar)
+  IF(MSVC)
+	MESSAGE(STATUS "Setting up precompiler header support")
+    GET_FILENAME_COMPONENT(PrecompiledBasename ${PrecompiledHeader} NAME_WE)
+    SET(PrecompiledBinary "${CMAKE_CURRENT_BINARY_DIR}/${PrecompiledBasename}.pch")
+    SET(Sources ${${SourcesVar}})
+
+    SET_SOURCE_FILES_PROPERTIES(${PrecompiledSource}
+                                PROPERTIES COMPILE_FLAGS "/Yc\"${PrecompiledHeader}\" /Fp\"${PrecompiledBinary}\""
+                                           OBJECT_OUTPUTS "${PrecompiledBinary}")
+										   
+    SET_SOURCE_FILES_PROPERTIES(${Sources}
+                                PROPERTIES COMPILE_FLAGS "/Yu\"${PrecompiledBinary}\" /FI\"${PrecompiledBinary}\" /Fp\"${PrecompiledBinary}\""
+                                           OBJECT_DEPENDS "${PrecompiledBinary}")  
+    # Add precompiled header to SourcesVar
+    LIST(APPEND ${SourcesVar} ${PrecompiledSource})
+  ENDIF(MSVC)
+ENDMACRO(ADD_MSVC_PRECOMPILED_HEADER)
+
 # configurable variables for cmakegui
 IF(NOT DEFINED ARINSIDE_ENABLE_ZLIB_SUPPORT)
 	SET(ARINSIDE_ENABLE_ZLIB_SUPPORT CACHE BOOL "Enables zlib-compression support. See documentation for more details")
@@ -34,7 +56,7 @@
 ENDIF(NOT DEFINED ARINSIDE_BETA)	
 
 IF (NOT DEFINED AR_INCLUDE_PATH)
-	SET(AR_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../api750" CACHE PATH "Path to the arapi root dir where 'include' and 'lib' is located.")
+	SET(AR_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../api764" CACHE PATH "Path to the arapi root dir where 'include' and 'lib' is located.")
 ENDIF(NOT DEFINED AR_INCLUDE_PATH)
 
 IF(NOT EXISTS ${AR_INCLUDE_PATH})
@@ -103,7 +125,7 @@
  scan/ScanMain.cpp scan/ScanSchema.cpp
  tinyxml/tinyxml.cpp tinyxml/tinystr.cpp tinyxml/tinyxmlerror.cpp tinyxml/tinyxmlparser.cpp
  util/RefItem.cpp util/AppTimer.cpp util/Util.cpp util/BlackListItem.cpp
- AppConfig.cpp ARInside.cpp ConfigFile.cpp gzstream.cpp Main.cpp stdafx.cpp WindowsUtil.cpp
+ AppConfig.cpp ARInside.cpp ConfigFile.cpp gzstream.cpp Main.cpp WindowsUtil.cpp
 )
 SET (ARINSIDE_SRC_GIFS
  res/active_link.gif res/al_guide.gif res/application.gif res/ars_edit.gif res/chapter.gif res/disabled.gif
@@ -260,6 +282,8 @@
 	SET(ARINSIDE_SRCS ${ARINSIDE_SRCS} "ARInside.rc")
 ENDIF(UNIX)
 
+ADD_MSVC_PRECOMPILED_HEADER("stdafx.h" "stdafx.cpp" ARINSIDE_SRCS)
+
 # generate svnrev.h file
 FIND_PACKAGE(Subversion)
 IF(Subversion_FOUND)

Modified: branches/work_303/core/AREnum.h
==============================================================================
--- branches/work_303/core/AREnum.h	Sun Oct  2 14:49:38 2011	(r225)
+++ branches/work_303/core/AREnum.h	Sun Oct  2 16:18:44 2011	(r226)
@@ -2358,13 +2358,13 @@
 
 	static const char* GetOverlayTypeString(int overlayType)
 	{
+#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
 		switch (overlayType)
 		{
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_764
 		case AR_OVERLAID_OBJECT: return " (Base) ";
 		case AR_OVERLAY_OBJECT: return " (Overlay) ";
-#endif
-		default: return "";
 		}
+#endif
+		return "";
 	}
 };

Modified: branches/work_303/output/FileNaming.cpp
==============================================================================
--- branches/work_303/output/FileNaming.cpp	Sun Oct  2 14:49:38 2011	(r225)
+++ branches/work_303/output/FileNaming.cpp	Sun Oct  2 16:18:44 2011	(r226)
@@ -1854,6 +1854,7 @@
 	const CARRole* obj;
 };
 
+#if AR_CURRENT_API_VERSION >= AR_API_VERSION_750
 class ObjectNameImageDetail : public IFileStructure
 {
 public:
@@ -1866,7 +1867,6 @@
 	const CARImage* obj;
 };
 
-#if AR_CURRENT_API_VERSION >= AR_API_VERSION_750
 class ObjectNameImageData : public IFileStructure
 {
 public:


More information about the arinside-src mailing list