linux compiler changes for libclearsky and libsolar updates

Author: mjwagner2

build_linux/Makefile

@@ -1,11 +1,13 @@
 all:
+	make -f Makefile-libclearsky -j4
 	make -f Makefile-libcycle -j4
 	make -f Makefile-liboptical -j4
 	make -f Makefile-libsolar -j4
 	make -f Makefile-libcluster -j4
 	make -f Makefile-app -j4
 
 clean:
+	make -f Makefile-libclearsky clean
 	make -f Makefile-libcycle clean
 	make -f Makefile-liboptical clean
 	make -f Makefile-libsolar clean

build_linux/Makefile-app

@@ -13,8 +13,15 @@ LKLIB = $(LKDIR)/lkuxwx3.a
 CC = gcc
 CXX = g++
 WARNINGS=-Wall -Wno-unknown-pragmas #-Werror
-CFLAGS =  -g -O0 -I. -I$(WEXDIR)/include -I$(LKDIR)/include -I$(SSCDIR) -I$(HOME)/libsolar -I$(HOME)/liboptical -I$(HOME)/libcluster -I$(HOME)/libcycle -DLK_USE_WXWIDGETS `wx-config-3 --cflags` $(WARNINGS)
-LDFLAGS = -std=c++0x -no-pie -I.. ./ssc.so $(WEXLIB) $(LKLIB) liboptical.a libsolar.a libcluster.a libcycle.a `wx-config-3 --libs stc` `wx-config-3 --libs aui` `wx-config-3 --libs` -lm  -lfontconfig -ldl -lcurl 
+CFLAGS =  -g -O0 -I. -I$(WEXDIR)/include -I$(LKDIR)/include -I$(SSCDIR) \
+                 -I$(HOME)/libsolar -I$(HOME)/liboptical -I$(HOME)/libcluster -I$(HOME)/libcycle -I$(HOME)/libclearsky \
+                 -DLK_USE_WXWIDGETS `wx-config-3 --cflags` $(WARNINGS)
+
+LDFLAGS = -std=c++0x -no-pie -I.. ./ssc.so $(WEXLIB) $(LKLIB) \
+                  liboptical.a libsolar.a libcluster.a libcycle.a libclearsky.a \
+                  `wx-config-3 --libs stc` `wx-config-3 --libs aui` \
+                  `wx-config-3 --libs` -lm  -lfontconfig -ldl -lcurl 
+                  
 CXXFLAGS=-std=c++0x $(CFLAGS)
 
 

build_linux/Makefile-libclearsky

@@ -0,0 +1,20 @@
+VPATH=../libclearsky
+
+CXX = g++
+CFLAGS = -g -D__64BIT__ -fPIC -Wall -O3
+#LDFLAGS = -std=c++11 -lm -lstdc++ 
+CXXFLAGS= -std=c++0x $(CFLAGS)
+
+
+OBJECTS = \
+	solpos.o\
+	clearsky.o
+
+TARGET = libclearsky.a
+
+$(TARGET) : $(OBJECTS)
+	ar rs $(TARGET) $(OBJECTS)
+
+clean:
+	rm -rf $(TARGET) $(OBJECTS)
+

build_linux/Makefile-libsolar

@@ -8,6 +8,8 @@ CXXFLAGS= -std=c++0x $(CFLAGS)
 
 OBJECTS = \
 	solarfield_structures.o\
+    solarfield_heliostat.o\
+    solarfield_staff.o\
 	solarfield_avail.o
 
 TARGET = libsolar.a

libclearsky/clearsky.cpp

@@ -2,7 +2,8 @@
 #include "clearsky.h"
 #include <fstream>
 #include <sstream>
-
+#include <limits>
+#include <cmath>
 
 
 s_location::s_location()

libclearsky/clearsky.h

@@ -2,6 +2,7 @@
 #define _CSKYH_
 
 #include <vector>
+#include <string> 
 
 #include "solpos00.h"