Changeset 2564


Ignore:
Timestamp:
Apr 1, 2009 3:48:35 PM (10 years ago)
Author:
bennylp
Message:

More ticket #774 (re: g722): some modifications in VS6 projects/workspace

Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjproject.dsw

    r2563 r2564  
    44############################################################################### 
    55 
    6 Project: "libg7221"=.\third_party\build\g7221\libg7221.dsp - Package Owner=<4> 
     6Project: "libg7221codec"=.\third_party\build\g7221\libg7221.dsp - Package Owner=<4> 
    77 
    88Package=<5> 
     
    249249    Project_Dep_Name pjmedia_audiodev 
    250250    End Project Dependency 
     251    Begin Project Dependency 
     252    Project_Dep_Name libg7221codec 
     253    End Project Dependency 
    251254}}} 
    252255 
     
    384387    Project_Dep_Name libg7221 
    385388    End Project Dependency 
     389    Begin Project Dependency 
     390    Project_Dep_Name libg7221codec 
     391    End Project Dependency 
    386392}}} 
    387393 
     
    555561    Project_Dep_Name pjmedia_audiodev 
    556562    End Project Dependency 
     563    Begin Project Dependency 
     564    Project_Dep_Name libg7221codec 
     565    End Project Dependency 
    557566}}} 
    558567 
  • pjproject/trunk/third_party/build/g7221/libg7221.dsp

    r2563 r2564  
    1 # Microsoft Developer Studio Project File - Name="libg7221" - Package Owner=<4> 
     1# Microsoft Developer Studio Project File - Name="libg7221codec" - Package Owner=<4> 
    22# Microsoft Developer Studio Generated Build File, Format Version 6.00 
    33# ** DO NOT EDIT ** 
     
    55# TARGTYPE "Win32 (x86) Static Library" 0x0104 
    66 
    7 CFG=libg7221 - Win32 Debug 
     7CFG=libg7221codec - Win32 Debug 
    88!MESSAGE This is not a valid makefile. To build this project using NMAKE, 
    99!MESSAGE use the Export Makefile command and run 
    1010!MESSAGE  
    11 !MESSAGE NMAKE /f "libg7221.mak". 
     11!MESSAGE NMAKE /f "libg7221codec.mak". 
    1212!MESSAGE  
    1313!MESSAGE You can specify a configuration when running NMAKE 
    1414!MESSAGE by defining the macro CFG on the command line. For example: 
    1515!MESSAGE  
    16 !MESSAGE NMAKE /f "libg7221.mak" CFG="libg7221 - Win32 Debug" 
     16!MESSAGE NMAKE /f "libg7221codec.mak" CFG="libg7221codec - Win32 Debug" 
    1717!MESSAGE  
    1818!MESSAGE Possible choices for configuration are: 
    1919!MESSAGE  
    20 !MESSAGE "libg7221 - Win32 Release" (based on "Win32 (x86) Static Library") 
    21 !MESSAGE "libg7221 - Win32 Debug" (based on "Win32 (x86) Static Library") 
     20!MESSAGE "libg7221codec - Win32 Release" (based on "Win32 (x86) Static Library") 
     21!MESSAGE "libg7221codec - Win32 Debug" (based on "Win32 (x86) Static Library") 
    2222!MESSAGE  
    2323 
     
    2929RSC=rc.exe 
    3030 
    31 !IF  "$(CFG)" == "libg7221 - Win32 Release" 
     31!IF  "$(CFG)" == "libg7221codec - Win32 Release" 
    3232 
    3333# PROP BASE Use_MFC 0 
     
    3838# PROP Use_MFC 0 
    3939# PROP Use_Debug_Libraries 0 
    40 # PROP Output_Dir "output\libg7221-i386-win32-vc6-release" 
    41 # PROP Intermediate_Dir "output\libg7221-i386-win32-vc6-release" 
     40# PROP Output_Dir "output\libg7221codec-i386-win32-vc6-release" 
     41# PROP Intermediate_Dir "output\libg7221codec-i386-win32-vc6-release" 
    4242# PROP Target_Dir "" 
    4343F90=df.exe 
    4444# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 
    45 # ADD CPP /nologo /W3 /GX /O2 /I "../.." /I "../../g7221/common" /I "../../g7221/common/stl-files" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 
     45# ADD CPP /nologo /MT /W3 /GX /O2 /I "../.." /I "../../g7221/common" /I "../../g7221/common/stl-files" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c 
    4646# ADD BASE RSC /l 0x409 /d "NDEBUG" 
    4747# ADD RSC /l 0x409 /d "NDEBUG" 
     
    5151LIB32=link.exe -lib 
    5252# ADD BASE LIB32 /nologo 
    53 # ADD LIB32 /nologo /out:"..\..\lib\libg7221-i386-win32-vc6-release.lib" 
     53# ADD LIB32 /nologo /out:"..\..\lib\libg7221codec-i386-win32-vc6-release.lib" 
    5454 
    55 !ELSEIF  "$(CFG)" == "libg7221 - Win32 Debug" 
     55!ELSEIF  "$(CFG)" == "libg7221codec - Win32 Debug" 
    5656 
    5757# PROP BASE Use_MFC 0 
     
    6262# PROP Use_MFC 0 
    6363# PROP Use_Debug_Libraries 1 
    64 # PROP Output_Dir "output\libg7221-i386-win32-vc6-debug" 
    65 # PROP Intermediate_Dir "output\libg7221-i386-win32-vc6-debug" 
     64# PROP Output_Dir "output\libg7221codec-i386-win32-vc6-debug" 
     65# PROP Intermediate_Dir "output\libg7221codec-i386-win32-vc6-debug" 
    6666# PROP Target_Dir "" 
    6767F90=df.exe 
    6868# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c 
    69 # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../.." /I "../../g7221/common" /I "../../g7221/common/stl-files" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c 
     69# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../.." /I "../../g7221/common" /I "../../g7221/common/stl-files" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c 
    7070# ADD BASE RSC /l 0x409 /d "_DEBUG" 
    7171# ADD RSC /l 0x409 /d "_DEBUG" 
     
    7575LIB32=link.exe -lib 
    7676# ADD BASE LIB32 /nologo 
    77 # ADD LIB32 /nologo /out:"..\..\lib\libg7221-i386-win32-vc6-debug.lib" 
     77# ADD LIB32 /nologo /out:"..\..\lib\libg7221codec-i386-win32-vc6-debug.lib" 
    7878 
    7979!ENDIF  
     
    8181# Begin Target 
    8282 
    83 # Name "libg7221 - Win32 Release" 
    84 # Name "libg7221 - Win32 Debug" 
     83# Name "libg7221codec - Win32 Release" 
     84# Name "libg7221codec - Win32 Debug" 
    8585# Begin Group "Source Files" 
    8686 
Note: See TracChangeset for help on using the changeset viewer.