From: Martin Perner <martin@perner.cc>
Date: Tue, 2 Nov 2010 11:20:26 +0000 (+0100)
Subject: sim: fixed for tilab
X-Git-Tag: bootrom_v1~191
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=calu.git;a=commitdiff_plain;h=ee9a0dc5ec0f5bf48d63af40b5f71c6339617513

sim: fixed for tilab
---

diff --git a/3b_sim/Makefile.flags b/3b_sim/Makefile.flags
index f79e104..1d2ab2b 100644
--- a/3b_sim/Makefile.flags
+++ b/3b_sim/Makefile.flags
@@ -1,6 +1,13 @@
-CC := ccache g++
+#tilab is centos, and centos@tilab is special
+OSTYPE = $(shell lsb_release -i -s | tr -d "\n")
 
-CPPFLAGS = -g3 -O2 -std=c++0x -Wnon-virtual-dtor -Weffc++ -pedantic -Werror -Wall -Wextra -W -Wshadow -fno-common -pedantic-errors -Wpointer-arith -Wcast-qual -Wcast-align -Woverloaded-virtual -Wswitch-default -Wempty-body -Wlogical-op
+ifeq ("$(OSTYPE)", "CentOS")
+CC := g++44
+CPPPROGOPT :=-rdynamic -ldl -lboost_program_options-gcc41-mt-1_37 -lreadline -lcurses
+else
+CC := ccache g++
+CPPPROGOPT :=-rdynamic -ldl -lboost_program_options -lreadline
+endif
 
-CPPPROGOPT=-rdynamic -ldl -lboost_program_options -lreadline
-CPPLIBOPT=-shared
+CPPFLAGS := -g3 -O2 -std=c++0x -Wnon-virtual-dtor -Weffc++ -pedantic -Werror -Wall -Wextra -W -Wshadow -fno-common -pedantic-errors -Wpointer-arith -Wcast-qual -Wcast-align -Woverloaded-virtual -Wswitch-default -Wempty-body -Wlogical-op
+CPPLIBOPT :=-shared
diff --git a/3b_sim/cdat.hpp b/3b_sim/cdat.hpp
index b5d212b..2046de5 100644
--- a/3b_sim/cdat.hpp
+++ b/3b_sim/cdat.hpp
@@ -4,8 +4,8 @@
 #include <string>
 #include <sstream>
 
-typedef __UINT32_TYPE__ CDat;
-typedef __UINT64_TYPE__ CDatd;
+typedef __uint32_t CDat;
+typedef __uint64_t CDatd;
 
 #define BYTE_COUNT 4
 
diff --git a/3b_sim/sim.cpp b/3b_sim/sim.cpp
index 6471712..55be21d 100644
--- a/3b_sim/sim.cpp
+++ b/3b_sim/sim.cpp
@@ -602,7 +602,8 @@ int main(int argc, char* argv[])
 	vector<string> Tokens, lastTokens;
 	bool EndOfInput = false;
 
-	auto Found(Completers.end());
+	//tilab g++44 doesn't like auto here
+	MyCompleterContainer::iterator Found(Completers.end());
 
 	Func lastFunc = NULL;
 
diff --git a/3c_disasm/Makefile.flags b/3c_disasm/Makefile.flags
deleted file mode 100644
index 1284653..0000000
--- a/3c_disasm/Makefile.flags
+++ /dev/null
@@ -1,6 +0,0 @@
-CC := ccache g++
-
-CPPFLAGS = -g3 -O2 -std=c++0x -Wnon-virtual-dtor -Weffc++ -pedantic -Werror -Wall -Wextra -W -Wshadow -fno-common -pedantic-errors -Wpointer-arith -Wcast-qual -Wcast-align -Woverloaded-virtual -Wswitch-default -Wempty-body -Wlogical-op
-
-CPPPROGOPT=-rdynamic -ldl -lboost_program_options
-CPPLIBOPT=-shared
diff --git a/3c_disasm/Makefile.flags b/3c_disasm/Makefile.flags
new file mode 120000
index 0000000..85b345a
--- /dev/null
+++ b/3c_disasm/Makefile.flags
@@ -0,0 +1 @@
+../3b_sim/Makefile.flags
\ No newline at end of file