Changeset 121 for pjproject/trunk/pjmedia/build

Timestamp:

Jan 18, 2006 11:12:57 PM (18 years ago)

Author:

bennylp

Message:

Compiled cleanly first time for the new pjlib

Location:

pjproject/trunk/pjmedia/build

Files:

• . (modified) (1 prop)
• output (modified) (1 prop)
• pjaut.dsp (moved) (moved from pjproject/trunk/pjmedia/build/pjmedia_audio_tool.dsp) (5 diffs)
• pjmedia.dsp (modified) (3 diffs)
• pjmedia.dsw (modified) (5 diffs)
• pjmedia.sln (deleted)
• pjmedia.vcproj (deleted)
• pjmedia_audio_tool.vcproj (deleted)
• pjmedia_test.vcproj (deleted)

pjproject/trunk/pjmedia/build/pjaut.dsp

@@ -1 @@
-# Microsoft Developer Studio Project File - Name="pjmedia_audio_tool" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="pjaut" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
@@ -5 +5 @@
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=pjmedia_audio_tool - Win32 Debug
+CFG=pjaut - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "pjmedia_audio_tool.mak".
+!MESSAGE NMAKE /f "pjaut.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "pjmedia_audio_tool.mak" CFG="pjmedia_audio_tool - Win32 Debug"
+!MESSAGE NMAKE /f "pjaut.mak" CFG="pjaut - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "pjmedia_audio_tool - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "pjmedia_audio_tool - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "pjaut - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "pjaut - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
@@ -29 +29 @@
 RSC=rc.exe
 
-!IF  "$(CFG)" == "pjmedia_audio_tool - Win32 Release"
+!IF  "$(CFG)" == "pjaut - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\output\pjmedia_audio_tool_vc6_Release"
-# PROP BASE Intermediate_Dir ".\output\pjmedia_audio_tool_vc6_Release"
+# PROP BASE Output_Dir ".\output\pjaut_i386_win32_vc6_release"
+# PROP BASE Intermediate_Dir ".\output\pjaut_i386_win32_vc6_release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\output\pjmedia_audio_tool_vc6_Release"
-# PROP Intermediate_Dir ".\output\pjmedia_audio_tool_vc6_Release"
+# PROP Output_Dir ".\output\pjaut_i386_win32_vc6_release"
+# PROP Intermediate_Dir ".\output\pjaut_i386_win32_vc6_release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
@@ -53 +53 @@
 # ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.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 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:"../bin/pjaut_vc6.exe"
 
-!ELSEIF  "$(CFG)" == "pjmedia_audio_tool - Win32 Debug"
+!ELSEIF  "$(CFG)" == "pjaut - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\output\pjmedia_audio_tool_vc6_Debug"
-# PROP BASE Intermediate_Dir ".\output\pjmedia_audio_tool_vc6_Debug"
+# PROP BASE Output_Dir ".\output\pjaut_i386_win32_vc6_debug"
+# PROP BASE Intermediate_Dir ".\output\pjaut_i386_win32_vc6_debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\output\pjmedia_audio_tool_vc6_Debug"
-# PROP Intermediate_Dir ".\output\pjmedia_audio_tool_vc6_Debug"
+# PROP Output_Dir ".\output\pjaut_i386_win32_vc6_debug"
+# PROP Intermediate_Dir ".\output\pjaut_i386_win32_vc6_debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
@@ -81 +81 @@
 # Begin Target
 
-# Name "pjmedia_audio_tool - Win32 Release"
-# Name "pjmedia_audio_tool - Win32 Debug"
+# Name "pjaut - Win32 Release"
+# Name "pjaut - Win32 Debug"
 # Begin Group "Source Files"
 

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -33 +33 @@
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\output\pjmedia_vc6_Release"
-# PROP BASE Intermediate_Dir ".\output\pjmedia_vc6_Release"
+# PROP BASE Output_Dir ".\output\pjmedia_i386_win32_vc6_release"
+# PROP BASE Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_release"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\output\pjmedia_vc6_Release"
-# PROP Intermediate_Dir ".\output\pjmedia_vc6_Release"
+# PROP Output_Dir ".\output\pjmedia_i386_win32_vc6_release"
+# PROP Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /O2 /I "../../pjlib/src" /I "../src" /I "../../pjsdp/src" /I "../src/pjmedia/portaudio" /D "NDEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /FD /c
+# ADD CPP /nologo /MD /W4 /GX /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /D "NDEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -57 +57 @@
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\output\pjmedia_vc6_Debug"
-# PROP BASE Intermediate_Dir ".\output\pjmedia_vc6_Debug"
+# PROP BASE Output_Dir ".\output\pjmedia_i386_win32_vc6_debug"
+# PROP BASE Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_debug"
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\output\pjmedia_vc6_Debug"
-# PROP Intermediate_Dir ".\output\pjmedia_vc6_Debug"
+# PROP Output_Dir ".\output\pjmedia_i386_win32_vc6_debug"
+# PROP Intermediate_Dir ".\output\pjmedia_i386_win32_vc6_debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../../pjlib/src" /I "../src" /I "../../pjsdp/src" /I "../src/pjmedia/portaudio" /D "_DEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../src/pjmedia/portaudio" /D "_DEBUG" /D "PA_NO_ASIO" /D "WIN32" /D "_MBCS" /D "_LIB" /D PJ_WIN32=1 /D PJ_M_I386=1 /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -142 +142 @@
 # Begin Source File
 
-SOURCE=..\src\pjmedia\codec.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\config.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\jbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\mediamgr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\rtcp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\rtp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\sdp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\session.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\pjmedia\stream.h
+SOURCE=..\include\pjmedia\codec.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\config.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\jbuf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\mediamgr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\rtcp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\rtp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\sdp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\session.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\stream.h
 # End Source File
 # End Group

pjproject/trunk/pjmedia/build/pjmedia.dsw

@@ -4 +4 @@
 ###############################################################################
 
-Project: "pjaudio_tool"=.\pjaudio_tool.dsp - Package Owner=<4>
+Project: "pjaut"=.\pjaut.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
-    begin source code control
-    "$/pjproject/pjmedia/build", TKAAAAAA
-    .
-    end source code control
 }}}
 
@@ -30 +26 @@
 Package=<5>
 {{{
-    begin source code control
-    "$/pjproject/pjmedia/build", TKAAAAAA
-    .
-    end source code control
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "pjlib_util"="..\..\pjlib-util\build\pjlib_util.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
 }}}
 
@@ -46 +50 @@
 Package=<5>
 {{{
-    begin source code control
-    "$/pjproject/pjmedia/build", TKAAAAAA
-    .
-    end source code control
 }}}
 
@@ -65 +65 @@
 Package=<5>
 {{{
-    begin source code control
-    "$/pjproject/pjmedia/build", TKAAAAAA
-    .
-    end source code control
 }}}
 
@@ -90 +86 @@
 Package=<5>
 {{{
-    begin source code control
-    "$/pjproject/pjmedia/build", TKAAAAAA
-    .
-    end source code control
 }}}