diff --git CMakeLists.txt CMakeLists.txt
index d8c5070..33a5958 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 2.8.4)
 project("daysim")
 
+add_definitions(-DDAYSIM) 
+
 if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.11")
   cmake_policy(SET CMP0020 NEW)
   if(NOT ${CMAKE_VERSION} VERSION_LESS "3.0")
@@ -61,7 +63,7 @@ endif()
 
 if(UNIX)
   set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local/daysim")
-  add_definitions(-Dlinux -D_FILE_OFFSET_BITS=64 -DNOSTEREO)
+  add_definitions(-std=c++11 -Dlinux -D_FILE_OFFSET_BITS=64 -DNOSTEREO)
 else()
   set(CPACK_PACKAGING_INSTALL_PREFIX "/")
 endif()
diff --git src/daysim/CMakeLists.txt src/daysim/CMakeLists.txt
index 297c370..af9f8b6 100755
--- src/daysim/CMakeLists.txt
+++ src/daysim/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(${CMAKE_SOURCE_DIR}/common)
 add_library(daysim_common fropen.c parse.c read_in_header.c nrutil.c numerical.c sun.c "${VERSION_FILE}")
 
 add_executable(gen_reindl gen_reindl.c)
-target_link_libraries(gen_reindl rtrad daysim_common)
+target_link_libraries(gen_reindl daysim_common rtrad)
 
 add_executable(gencumulativesky gendiscretesky.cpp climateFile.cpp cPerezSkyModel.cpp cSkyVault.cpp cSun.cpp)
 target_link_libraries(gencumulativesky rtrad daysim_common)
diff --git src/daysim/cSkyVault.h src/daysim/cSkyVault.h
index e6a517a..7a976b8 100644
--- src/daysim/cSkyVault.h
+++ src/daysim/cSkyVault.h
@@ -1,5 +1,5 @@
 #include "cPerezSkyModel.h"
-#include "ClimateFile.h"
+#include "climateFile.h"
 #include "ds_constants.h"
 
 /////////////////////////////////////////////
diff --git src/daysim/get_illuminances.c src/daysim/get_illuminances.c
index e108d13..1536aec 100644
--- src/daysim/get_illuminances.c
+++ src/daysim/get_illuminances.c
@@ -77,10 +77,10 @@ void get_daylight_illuminances( )
 	
 	//allocate memory for Daylight_Illuminance_No_Blinds[TimeState][NumberOfSensors]
 	Daylight_Illuminance_No_Blinds = (float**)malloc(sizeof(float*)*time_steps_in_year);
-	if (Daylight_Illuminance_No_Blinds == NULL) goto memerr;
+	//if (Daylight_Illuminance_No_Blinds == NULL) goto memerr;
 	for (i = 0; i < time_steps_in_year; i++) {
 		Daylight_Illuminance_No_Blinds[i] = (float*)malloc(sizeof(float)*number_of_sensors);
-		if (Daylight_Illuminance_No_Blinds[i] == NULL) goto memerr;
+		//if (Daylight_Illuminance_No_Blinds[i] == NULL) goto memerr;
 		for (j = 0; j < number_of_sensors; j++)
 			Daylight_Illuminance_No_Blinds[i][j] = 0;
 	}
@@ -140,8 +140,8 @@ void get_daylight_illuminances( )
 			}			
 		}	
 	}
-memerr:
-	error(SYSTEM, "out of memory in get_daylight_illuminances");
+//memerr:
+//	error(SYSTEM, "out of memory in get_daylight_illuminances");
 }
 				
 
diff --git src/rt/CMakeLists.txt src/rt/CMakeLists.txt
index fb5c116..3fa0f82 100644
--- src/rt/CMakeLists.txt
+++ src/rt/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(radiance
       	pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c 
       	pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c 
       	pmapdata.c pmapdiag.c pmaptype.c pmutil.c pmcontrib2.c
-		../common/random.h ../common/platform.h func.c
+		../common/random.h ../common/platform.h func.c daysim.c
       	"${VERSION_FILE}" virtuals.c ../common/paths.c)
 
 if(WIN32)