summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-04-20 10:38:36 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-04-20 10:38:36 +0000
commitee27683bb674ffebc89aebd5499fe20eb634b6d9 (patch)
tree00f3fd72406a9a829d4ef93a9b9516fdfc634da5
parent954d21cb31b89bb6b1b322cadfdea5f2f75b4f6b (diff)
downloadATCD-ee27683bb674ffebc89aebd5499fe20eb634b6d9.tar.gz
Mon Apr 20 11:38:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_cegcc.GNU: Only set COMPARCH when it has not been set yet
-rw-r--r--ACE/ChangeLog25
-rw-r--r--ACE/include/makeinclude/platform_cegcc.GNU4
2 files changed, 17 insertions, 12 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index ec83a77a599..945e29e96d7 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 20 11:38:32 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * include/makeinclude/platform_cegcc.GNU:
+ Only set COMPARCH when it has not been set yet
+
Mon Apr 20 10:17:32 UTC 2009 Marcel Smit <msmit@remedy.nl>
* ace/Basic_Types.h:
@@ -6,41 +11,41 @@ Mon Apr 20 10:17:32 UTC 2009 Marcel Smit <msmit@remedy.nl>
* ace/OS_NS_sys_socket.h:
* ace/OS_NS_Thread.cpp:
Removed WinCE support for versions < 5.0.
-
+
* ace/config-win32-cegcc.h:
Removed temporary defines.
-
+
* ace/config-win32-common.h:
Replaced UNDER_CE with _WIN32_WCE.
-
+
* ace/OS_main.cpp:
* ace/OS_main.h:
- Removed CE gcc compiler warning by
+ Removed CE gcc compiler warning by
adding destructor.
-
+
* ace/OS_NS_Thread.inl:
Removed WinCE support for versions before 5.0.
Added ACE_LACKS_CE_THREAD_PRIORITY define in order
to compile on CE gcc.
-
+
* ace/Process.cpp:
Removed CE gcc compiler warning by
using ACE_UNUSED_ARG.
* ace/Registry.cpp:
* ace/Registry.h:
- Removed CE gcc compiler warning by
+ Removed CE gcc compiler warning by
adding destructor.
Removed CE gcc compiler warning by
using ACE_UNUSED_ARG.
-
+
* ace/SV_Semaphore_Simple.cpp:
Removed pragma's for CE gcc compiler. Removed
check on ACE_WIN64 define.
-
+
* include/makeinclude/platform_cegcc.GNU:
Default platform macros for CE gcc compiler.
-
+
* include/makeinclude/platform_gnuwin32_common.GNU:
Added support for CE gcc compiler.
diff --git a/ACE/include/makeinclude/platform_cegcc.GNU b/ACE/include/makeinclude/platform_cegcc.GNU
index 275c1bc67c4..f8a9ede7f11 100644
--- a/ACE/include/makeinclude/platform_cegcc.GNU
+++ b/ACE/include/makeinclude/platform_cegcc.GNU
@@ -30,8 +30,8 @@ LDFLAGS += -Wl,--enable-auto-import
cpumodelflag=0
tunemodelflag=0
-#COMPARCH = i386-mingw32ce-
-COMPARCH = arm-wince-mingw32ce-
+#COMPARCH ?= i386-mingw32ce-
+COMPARCH ?= arm-wince-mingw32ce-
LIBS += -lcoredll -lmingw32 -lmingwex -lws2 -lsupc++ -liphlpapi