Merge pull request #4 from releasenetwork/master

multiplataform optimization
ljmf00-archive · Nov 7, 2015 · efe8465 · efe8465
2 parents f28840f + 65c1c54
commit efe8465
Show file tree

Hide file tree

Showing 13 changed files with 102 additions and 92 deletions.
diff --git a/.objs/crypto/md5.o b/.objs/crypto/md5.o
diff --git a/.objs/crypto/sha1.o b/.objs/crypto/sha1.o
diff --git a/.objs/crypto/sha2.o b/.objs/crypto/sha2.o
diff --git a/.objs/crypto/sha512.o b/.objs/crypto/sha512.o
diff --git a/.objs/sourcescript.o b/.objs/sourcescript.o
diff --git a/crypto/hex.h b/crypto/hex.h
@@ -6,7 +6,7 @@
 //Used namespaces
 using namespace std;
 
-class crypt
+class crypto
 {
 public:
     string char2hex( char dec )

diff --git a/lib/stdprint.hpp b/lib/stdprint.hpp
@@ -15,7 +15,7 @@
 #define STDPRINT_HPP_INCLUDED
 
 #if !(WIN32) //If dont support Windows :: Do Def. Inst.
-
+#define Sleep(x)
 #endif
 #if !(WIN64) //! win64
 

diff --git a/lib/stdutils.hpp b/lib/stdutils.hpp
@@ -28,7 +28,7 @@
 using namespace std;
 
 //Objects
-crypt crypt;
+crypto crypto;
 
 // ...
 
@@ -87,8 +87,9 @@ class utils
 #endif
 
     }
-    void hourconvert(long hours)
+    void hourconvert(string hour)
     {
+        int hours = atoi(hour.c_str());
         long minute;
         long seconds;
         float days, weeks, years;
@@ -161,7 +162,7 @@ class utils
             else
             {
                 escaped.append("%");
-                escaped.append( crypt.char2hex(c[i]) );//converts char 255 to string "ff"
+                escaped.append( crypto.char2hex(c[i]) );//converts char 255 to string "ff"
             }
         }
         return escaped;

diff --git a/sourcescript b/sourcescript
diff --git a/sourcescript.cpp b/sourcescript.cpp
@@ -227,7 +227,7 @@ int main(int argc, char *argv[])
         }
         else if (string(argv[1]) == "--hourconvert")
         {
-            utils.hourconvert(int(argv[2]));
+            utils.hourconvert(string(argv[2]));
         }
         else if (string(argv[1]) == "--md5")
         {

diff --git a/sourcescript.depend b/sourcescript.depend
@@ -5,6 +5,8 @@
 	"stdutils.hpp"
 	"stdfile.hpp"
 
+1442073351 pp"
+
 1442014540 g:\workspace\projects\sourcescript\libs.hpp
 	<windows.h>
 	<conio.h>
@@ -20,6 +22,8 @@
 	<unistd.h>
 	<stdio.h>
 
+1442236361 
+
 1442014540 g:\workspace\projects\sourcescript\pilib.hpp
 	"libs.hpp"
 
@@ -43,6 +47,8 @@
 	"crypto/sha2.h"
 	"crypto/base64.h"
 
+1443958512 se64.h"
+
 1442014540 g:\projects\sourcescript\libs.hpp
 	<windows.h>
 	<conio.h>
@@ -130,6 +136,8 @@
 1443957957 g:\projects\sourcescript\apps\tperiodic.hpp
 	"../lib/libs.hpp"
 
+1442696015 bs.hpp"
+
 1443957957 g:\projects\sourcescript\lib\libs.hpp
 	<windows.h>
 	<conio.h>
@@ -161,6 +169,8 @@
 	"libs.hpp"
 	"../crypto/hex.h"
 
+1442700390 /hex.h"
+
 1443958179 g:\projects\sourcescript\lib\stdfile.hpp
 	"libs.hpp"
 
@@ -268,3 +278,88 @@
 1442696015 c:\users\lu�s ferreira\workspace\projects\sourcescript\crypto\base64.h
 	"../lib/libs.hpp"
 
+1442682658 source:/media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/md5.cpp
+	"md5.h"
+	<cstdio>
+
+1442682613 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/md5.h
+	<cstring>
+	<iostream>
+
+1442688999 source:/media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/sha1.cpp
+	"../lib/libs.hpp"
+	"sha1.h"
+
+1443957957 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/libs.hpp
+	<windows.h>
+	<conio.h>
+	<tchar.h>
+	"TargetConditionals.h"
+	<iostream>
+	<fstream>
+	<sstream>
+	<string>
+	<iomanip>
+	<cstdlib>
+	<ciso646>
+	<cassert>
+	<cmath>
+	<clocale>
+	<cstring>
+	<sys/types.h>
+	<sys/stat.h>
+	<stdio.h>
+	<stdlib.h>
+	<string.h>
+	<fcntl.h>
+	<unistd.h>
+
+1442682982 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/sha1.h
+	<iostream>
+	<string>
+
+1442688766 source:/media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/sha2.cpp
+	"../lib/libs.hpp"
+	"sha2.h"
+
+1442683010 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/sha2.h
+	<string>
+
+1446918272 source:/media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/sourcescript.cpp
+	"lib/libs.hpp"
+	"lib/pilib.hpp"
+	"lib/stdutils.hpp"
+	"lib/stdfile.hpp"
+	"lib/stdprint.hpp"
+	"lib/printdef.hpp"
+	"apps/tperiodic.hpp"
+	"crypto/hex.h"
+	"crypto/md5.h"
+	"crypto/sha1.h"
+	"crypto/sha2.h"
+	"crypto/base64.h"
+
+1442236400 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/pilib.hpp
+	"libs.hpp"
+
+1446918382 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/stdutils.hpp
+	"libs.hpp"
+	"../crypto/hex.h"
+
+1446918073 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/hex.h
+	"../lib/libs.hpp"
+
+1443958179 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/stdfile.hpp
+	"libs.hpp"
+
+1446917841 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/stdprint.hpp
+	"libs.hpp"
+
+1442237661 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/lib/printdef.hpp
+
+1443957957 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/apps/tperiodic.hpp
+	"../lib/libs.hpp"
+
+1442696015 /media/lsferreira/9C543DBD543D9B4A/Users/lsferreira/Github/sourcescript/crypto/base64.h
+	"../lib/libs.hpp"
+
diff --git a/sourcescript.exe b/sourcescript.exe
diff --git a/sourcescript.layout b/sourcescript.layout