Added license information and bug fixes

1 files changed, 26 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33c2e7d..26ed9dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,12 +156,16 @@ if (NOT EXISTS ${USCXML_PREBUILT_LIBRARY_PATH})
 
 endif()
 
-if (WIN32 OR CMAKE_CROSSCOMPILING)
+if (CMAKE_CROSSCOMPILING)
 	OPTION(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 else()
 	OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
 endif()
 
+if (NOT BUILD_SHARED_LIBS)
+	add_definitions("-DUSCXML_STATIC")
+endif()
+
 #
 # BUILD_PREFER_PREBUILT_LIBS:
 # Do we want to search system paths or contrib/prebuilt first?
@@ -289,8 +293,21 @@ elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
 	add_definitions("-D_CRT_SECURE_NO_WARNINGS")
 	add_definitions("/bigobj")
 	
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GL")
+
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG")
+	set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /LTCG")
+	set(STATIC_LIBRARY_FLAGS "${STATIC_LIBRARY_FLAGS} /LTCG")
+
+	# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
+	# set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
+	# set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
+	# set(STATIC_LIBRARY_FLAGS "${STATIC_LIBRARY_FLAGS} /NODEFAULTLIB:LIBCMT")
+	
 	# SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB")
 	# SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:MSVCRTD.lib")
+	
 elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-parentheses-equality")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-string-plus-int")
@@ -348,7 +365,7 @@ endif()
 
 # built shared or static libraries?
 if(BUILD_SHARED_LIBS)
-	add_definitions("-DCOMPILING_DLL")
+	add_definitions("-DUSCXML_EXPORT")
 else()
 	add_definitions("-DUSCXML_STATIC")
 endif()
@@ -661,8 +678,8 @@ endif()
 find_package(MILES)
 if (MILES_FOUND)
 	# openal is only needed for miles
-	find_package(OpenAL REQUIRED)
-	find_package(JPEG REQUIRED)
+	find_package(OpenAL)
+	find_package(JPEG)
 	list (APPEND MILES_LIBRARIES "iconv")
 	list (APPEND MILES_LIBRARIES ${JPEG_LIBRARIES})
 	list (APPEND USCXML_INCLUDE_DIRS ${OPENAL_INCLUDE_DIR})
@@ -694,8 +711,8 @@ SET(USCXML_ELEMENTS)
 SET(USCXML_DATAMODELS)
 SET(USCXML_LANGUAGE_BINDINGS)
 
-add_subdirectory(src/uscxml)
 include_directories(${USCXML_INCLUDE_DIRS})
+add_subdirectory(src/uscxml)
 if (WIN32)
 	list(APPEND USCXML_FILES "${PROJECT_SOURCE_DIR}/contrib/src/getopt/getopt.c")
 endif()
@@ -758,6 +775,9 @@ endif()
 if (BUILD_AS_PLUGINS)
 	add_library(uscxml ${USCXML_FILES})
 	target_link_libraries(uscxml ${USCXML_CORE_LIBS})
+	set_target_properties(uscxml PROPERTIES COMPILE_FLAGS "-DUSCXML_EXPORT")
+#	set_target_properties(uscxml PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS")
+	add_definitions(-DPLUMA_EXPORTS)
 else()
 	add_library(uscxml ${USCXML_FILES})
 	target_link_libraries(uscxml ${USCXML_OPT_LIBS} ${USCXML_CORE_LIBS})
@@ -773,7 +793,7 @@ if (NOT CMAKE_CROSSCOMPILING)
 	target_link_libraries(uscxml-browser uscxml)
 	if (NOT CMAKE_CROSSCOMPILING)
 		set_target_properties(uscxml-browser PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-		cotire(uscxml-browser)
+#		cotire(uscxml-browser)
 	endif()
 
 	set_target_properties(uscxml-browser PROPERTIES FOLDER "Apps")