From 83816d5113ccd802e922c7a8909d1a1f5b076b90 Mon Sep 17 00:00:00 2001 From: Date: Thu, 28 Apr 2016 17:16:38 -0400 Subject: [PATCH 1/5] [Common] MemoryManagement.cpp --- Source/Script/Unix/common.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Script/Unix/common.sh b/Source/Script/Unix/common.sh index 0e152110a..7f349b957 100755 --- a/Source/Script/Unix/common.sh +++ b/Source/Script/Unix/common.sh @@ -21,6 +21,7 @@ $CC -o $obj/FileClass.asm $src/FileClass.cpp $C_FLAGS $CC -o $obj/IniFileClass.asm $src/IniFileClass.cpp $C_FLAGS $CC -o $obj/LogClass.asm $src/LogClass.cpp $C_FLAGS $CC -o $obj/md5.asm $src/md5.cpp $C_FLAGS +$CC -o $obj/MemoryManagement.asm $src/MemoryManagement.cpp $C_FLAGS $CC -o $obj/MemTest.asm $src/MemTest.cpp $C_FLAGS $CC -o $obj/path.asm $src/path.cpp $C_FLAGS $CC -o $obj/stdstring.asm $src/StdString.cpp $C_FLAGS @@ -34,6 +35,7 @@ $AS -o $obj/FileClass.o $obj/FileClass.asm $AS -o $obj/IniFileClass.o $obj/IniFileClass.asm $AS -o $obj/LogClass.o $obj/LogClass.asm $AS -o $obj/md5.o $obj/md5.asm +$AS -o $obj/MemoryManagement.o $obj/MemoryManagement.asm $AS -o $obj/MemTest.o $obj/MemTest.asm $AS -o $obj/path.o $obj/path.asm $AS -o $obj/stdstring.o $obj/stdstring.asm @@ -48,6 +50,7 @@ OBJ_LIST="\ $obj/stdstring.o \ $obj/path.o \ $obj/MemTest.o \ + $obj/MemoryManagement.o \ $obj/md5.o \ $obj/LogClass.o \ $obj/IniFileClass.o \ From f0b91770d9cd2655feb82d4710ad0cb8228328a8 Mon Sep 17 00:00:00 2001 From: Date: Thu, 28 Apr 2016 17:18:29 -0400 Subject: [PATCH 2/5] [Common] Platform.cpp --- Source/Script/Unix/common.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Script/Unix/common.sh b/Source/Script/Unix/common.sh index 7f349b957..593ca0a0b 100755 --- a/Source/Script/Unix/common.sh +++ b/Source/Script/Unix/common.sh @@ -24,6 +24,7 @@ $CC -o $obj/md5.asm $src/md5.cpp $C_FLAGS $CC -o $obj/MemoryManagement.asm $src/MemoryManagement.cpp $C_FLAGS $CC -o $obj/MemTest.asm $src/MemTest.cpp $C_FLAGS $CC -o $obj/path.asm $src/path.cpp $C_FLAGS +$CC -o $obj/Platform.asm $src/Platform.cpp $C_FLAGS $CC -o $obj/stdstring.asm $src/StdString.cpp $C_FLAGS $CC -o $obj/SyncEvent.asm $src/SyncEvent.cpp $C_FLAGS $CC -o $obj/Trace.asm $src/Trace.cpp $C_FLAGS @@ -38,6 +39,7 @@ $AS -o $obj/md5.o $obj/md5.asm $AS -o $obj/MemoryManagement.o $obj/MemoryManagement.asm $AS -o $obj/MemTest.o $obj/MemTest.asm $AS -o $obj/path.o $obj/path.asm +$AS -o $obj/Platform.o $obj/Platform.asm $AS -o $obj/stdstring.o $obj/stdstring.asm $AS -o $obj/SyncEvent.o $obj/SyncEvent.asm $AS -o $obj/Trace.o $obj/Trace.asm @@ -48,6 +50,7 @@ OBJ_LIST="\ $obj/Trace.o \ $obj/SyncEvent.o \ $obj/stdstring.o \ + $obj/Platform.o \ $obj/path.o \ $obj/MemTest.o \ $obj/MemoryManagement.o \ From 74a0262aeb93bb6abd7dcaa4e4f55cd4989c3053 Mon Sep 17 00:00:00 2001 From: Date: Thu, 28 Apr 2016 17:21:37 -0400 Subject: [PATCH 3/5] [Common] DateTimeClass.cpp --- Source/Script/Unix/common.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Script/Unix/common.sh b/Source/Script/Unix/common.sh index 593ca0a0b..ab98212e4 100755 --- a/Source/Script/Unix/common.sh +++ b/Source/Script/Unix/common.sh @@ -27,6 +27,7 @@ $CC -o $obj/path.asm $src/path.cpp $C_FLAGS $CC -o $obj/Platform.asm $src/Platform.cpp $C_FLAGS $CC -o $obj/stdstring.asm $src/StdString.cpp $C_FLAGS $CC -o $obj/SyncEvent.asm $src/SyncEvent.cpp $C_FLAGS +$CC -o $obj/DateTimeClass.asm $src/DateTimeClass.cpp $C_FLAGS $CC -o $obj/Trace.asm $src/Trace.cpp $C_FLAGS $CC -o $obj/Util.asm $src/Util.cpp $C_FLAGS @@ -42,12 +43,14 @@ $AS -o $obj/path.o $obj/path.asm $AS -o $obj/Platform.o $obj/Platform.asm $AS -o $obj/stdstring.o $obj/stdstring.asm $AS -o $obj/SyncEvent.o $obj/SyncEvent.asm +$AS -o $obj/DateTimeClass.o $obj/DateTimeClass.asm $AS -o $obj/Trace.o $obj/Trace.asm $AS -o $obj/Util.o $obj/Util.asm OBJ_LIST="\ $obj/Util.o \ $obj/Trace.o \ + $obj/DateTimeClass.o \ $obj/SyncEvent.o \ $obj/stdstring.o \ $obj/Platform.o \ From 42d3c27e43843100fb29f9f4369438117200a7b7 Mon Sep 17 00:00:00 2001 From: Date: Thu, 28 Apr 2016 17:23:40 -0400 Subject: [PATCH 4/5] [Common] Thread.cpp --- Source/Script/Unix/common.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Script/Unix/common.sh b/Source/Script/Unix/common.sh index ab98212e4..46c5304fd 100755 --- a/Source/Script/Unix/common.sh +++ b/Source/Script/Unix/common.sh @@ -28,6 +28,7 @@ $CC -o $obj/Platform.asm $src/Platform.cpp $C_FLAGS $CC -o $obj/stdstring.asm $src/StdString.cpp $C_FLAGS $CC -o $obj/SyncEvent.asm $src/SyncEvent.cpp $C_FLAGS $CC -o $obj/DateTimeClass.asm $src/DateTimeClass.cpp $C_FLAGS +$CC -o $obj/Thread.asm $src/Thread.cpp $C_FLAGS $CC -o $obj/Trace.asm $src/Trace.cpp $C_FLAGS $CC -o $obj/Util.asm $src/Util.cpp $C_FLAGS @@ -44,12 +45,14 @@ $AS -o $obj/Platform.o $obj/Platform.asm $AS -o $obj/stdstring.o $obj/stdstring.asm $AS -o $obj/SyncEvent.o $obj/SyncEvent.asm $AS -o $obj/DateTimeClass.o $obj/DateTimeClass.asm +$AS -o $obj/Thread.o $obj/Thread.asm $AS -o $obj/Trace.o $obj/Trace.asm $AS -o $obj/Util.o $obj/Util.asm OBJ_LIST="\ $obj/Util.o \ $obj/Trace.o \ + $obj/Thread.o \ $obj/DateTimeClass.o \ $obj/SyncEvent.o \ $obj/stdstring.o \ From 21ebab7beb71f58a036d5d0dc56fcbc8d632055f Mon Sep 17 00:00:00 2001 From: Date: Thu, 28 Apr 2016 17:28:48 -0400 Subject: [PATCH 5/5] [Common] Be able to #include . --- Source/Script/Unix/common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Script/Unix/common.sh b/Source/Script/Unix/common.sh index 46c5304fd..a0bdd5ab9 100755 --- a/Source/Script/Unix/common.sh +++ b/Source/Script/Unix/common.sh @@ -4,6 +4,7 @@ obj=./Common mkdir -p $obj FLAGS_x86="\ + -I$src/.. \ -S \ -fPIC \ -masm=intel \