ACE libraries are renamed to conform with MicroSuck's convention.

2 files changed, 28 insertions, 7 deletions

diff --git a/examples/Log_Msg/Log_Msg.mak b/examples/Log_Msg/Log_Msg.mak
index 7c725f81ca9..3aa5b9fd03a 100644
--- a/examples/Log_Msg/Log_Msg.mak
+++ b/examples/Log_Msg/Log_Msg.mak
@@ -31,6 +31,7 @@ NULL=nul
 !ENDIF 

 ################################################################################

 # Begin Project

+# PROP Target_Last_Scanned "Log_Msg - Win32 Debug"

 RSC=rc.exe

 CPP=cl.exe

 

@@ -77,8 +78,8 @@ BSC32_SBRS= \
 	

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace-r.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"./test_log_msg.exe"

-LINK32_FLAGS=ace-r.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

+# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"./test_log_msg.exe"

+LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

  comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

  odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no\

  /pdb:"$(OUTDIR)/test_log_msg.pdb" /machine:I386\

@@ -138,8 +139,8 @@ BSC32_SBRS= \
 	

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386

-# ADD LINK32 ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"./test_log_msg.exe"

-LINK32_FLAGS=ace.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

+# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /out:"./test_log_msg.exe"

+LINK32_FLAGS=aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib\

  comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib\

  odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes\

  /pdb:"$(OUTDIR)/test_log_msg.pdb" /debug /machine:I386\

@@ -188,11 +189,31 @@ LINK32_OBJS= \
 # Begin Source File

 

 SOURCE=.\test_log_msg.cpp

-NODEP_CPP_TEST_=\

-	".\ace\OS.h"\

+DEP_CPP_TEST_=\

+	"..\..\ace\config-win32.h"\

+	{$(INCLUDE)}"\ace\ACE.h"\

+	{$(INCLUDE)}"\ace\ACE.i"\

+	{$(INCLUDE)}"\ace\Auto_Ptr.cpp"\

+	{$(INCLUDE)}"\ace\Auto_Ptr.h"\

+	{$(INCLUDE)}"\ace\Auto_Ptr.i"\

+	{$(INCLUDE)}"\ace\config-win32-common.h"\

+	{$(INCLUDE)}"\ace\config.h"\

+	{$(INCLUDE)}"\ace\Log_Msg.h"\

+	{$(INCLUDE)}"\ace\Log_Priority.h"\

+	{$(INCLUDE)}"\ace\Log_Record.h"\

+	{$(INCLUDE)}"\ace\Log_Record.i"\

+	{$(INCLUDE)}"\ace\Object_Manager.h"\

+	{$(INCLUDE)}"\ace\Object_Manager.i"\

+	{$(INCLUDE)}"\ace\OS.h"\

+	{$(INCLUDE)}"\ace\OS.i"\

+	{$(INCLUDE)}"\ace\SString.h"\

+	{$(INCLUDE)}"\ace\SString.i"\

+	{$(INCLUDE)}"\ace\stdcpp.h"\

+	{$(INCLUDE)}"\ace\Trace.h"\

+	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

 

-"$(INTDIR)\test_log_msg.obj" : $(SOURCE) "$(INTDIR)"

+"$(INTDIR)\test_log_msg.obj" : $(SOURCE) $(DEP_CPP_TEST_) "$(INTDIR)"

 

 

 # End Source File

diff --git a/examples/Log_Msg/Log_Msg.mdp b/examples/Log_Msg/Log_Msg.mdp
index a775997e594..993abfab3f5 100644
--- a/examples/Log_Msg/Log_Msg.mdp
+++ b/examples/Log_Msg/Log_Msg.mdp