sim: fixed for tilab

diff --git a/3b_sim/Makefile.flags b/3b_sim/Makefile.flags
index f79e104fc5667510e70c4885dffaff6b3a40a1d7..1d2ab2b06d6db0bbdede79852e12d44a3e114acc 100644 (file)
--- 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 b5d212b152f9a66fa8c61bc55194b55e1beb0a05..2046de5914162772fbfe2fbf497f7aee57f4b551 100644 (file)
--- 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 64717127cc2d5adc2b5792f11ee840b117c9f740..55be21d7318d449f96a72a8169b1f4ac7678a766 100644 (file)
--- 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 (file)
index 12846536304a9a6d15268503f90a74bdb098f5f9..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..85b345af0b622cd8d1c2b4f7d678825f342df41d
--- /dev/null
+++ b/3c_disasm/Makefile.flags
@@ -0,0 +1 @@
+../3b_sim/Makefile.flags
\ No newline at end of file