From Mike Weiblen, updates to dsp to improveme formatting and include OpenThreads
This commit is contained in:
@@ -39,21 +39,22 @@ RSC=rc.exe
|
||||
# PROP Use_Debug_Libraries 1
|
||||
# PROP Output_Dir "../../../bin"
|
||||
# PROP Intermediate_Dir "Debug"
|
||||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
MTL=midl.exe
|
||||
# ADD BASE MTL /nologo /win32
|
||||
# ADD MTL /nologo /win32
|
||||
# ADD BASE CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /GZ /Zm200 /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GR /GX /ZI /Od /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /GZ /Zm200 /c
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
# ADD BASE BSC32 /nologo
|
||||
# ADD BSC32 /nologo
|
||||
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 opengl32.lib glu32.lib osgd.lib Producer.lib osgProducerd.lib osgUtild.lib osgDBd.lib osgUtild.lib osgGAd.lib osgTextd.lib /nologo /subsystem:console /pdb:"..\..\..\bin\osgfxbrowser.pdb" /debug /machine:IX86 /out:"..\..\..\bin\osgfxbrowserd.exe" /pdbtype:sept
|
||||
# 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 opengl32.lib glu32.lib osgd.lib Producer.lib osgProducerd.lib osgUtild.lib osgDBd.lib osgUtild.lib osgGAd.lib osgTextd.lib /nologo /subsystem:console /debug /machine:IX86 /out:"..\..\..\bin\osgfxbrowserd.exe" /pdbtype:sept
|
||||
# SUBTRACT BASE LINK32 /pdb:none
|
||||
# ADD 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 opengl32.lib glu32.lib /nologo /subsystem:console /pdb:"..\..\..\bin\osgfxbrowser.pdb" /debug /machine:IX86 /out:"..\..\..\bin\osgfxbrowserd.exe" /pdbtype:sept
|
||||
# ADD LINK32 OpenThreadsWin32d.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 opengl32.lib glu32.lib /nologo /subsystem:console /debug /machine:IX86 /out:"..\..\..\bin\osgfxbrowserd.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../../OpenThreads/lib/win32" /libpath:"../../../../Producer/lib" /libpath:"../../../../3rdParty/lib"
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "Example osgfxbrowser - Win32 Release"
|
||||
@@ -73,7 +74,7 @@ MTL=midl.exe
|
||||
# ADD BASE MTL /nologo /win32
|
||||
# ADD MTL /nologo /win32
|
||||
# ADD BASE CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /c
|
||||
# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Zm200 /c
|
||||
# ADD CPP /nologo /MD /W3 /GR /GX /Zi /O2 /I "../../../include" /I "../../../../OpenThreads/include" /I "../../../../Producer/include" /I "../../../../3rdParty/include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /Zm200 /c
|
||||
# ADD BASE RSC /l 0x409
|
||||
# ADD RSC /l 0x409
|
||||
BSC32=bscmake.exe
|
||||
@@ -81,7 +82,7 @@ BSC32=bscmake.exe
|
||||
# ADD BSC32 /nologo
|
||||
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 opengl32.lib glu32.lib osg.lib Producer.lib osgProducer.lib osgUtil.lib osgDB.lib osgUtil.lib osgGA.lib osgText.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /opt:ref /opt:icf
|
||||
# ADD 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 opengl32.lib glu32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /opt:ref /opt:icf
|
||||
# ADD LINK32 OpenThreadsWin32.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 opengl32.lib glu32.lib /nologo /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../../OpenThreads/lib/win32" /libpath:"../../../../Producer/lib" /libpath:"../../../../3rdParty/lib" /opt:ref /opt:icf
|
||||
|
||||
!ENDIF
|
||||
|
||||
@@ -243,27 +244,29 @@ DEP_CPP_OSGFX=\
|
||||
"..\..\..\include\osgUtil\RenderStage"\
|
||||
"..\..\..\include\osgUtil\RenderStageLighting"\
|
||||
"..\..\..\Include\osgUtil\SceneView"\
|
||||
{$(INCLUDE)}"openthreads\barrier"\
|
||||
{$(INCLUDE)}"openthreads\condition"\
|
||||
{$(INCLUDE)}"openthreads\exports"\
|
||||
{$(INCLUDE)}"openthreads\mutex"\
|
||||
{$(INCLUDE)}"openthreads\thread"\
|
||||
{$(INCLUDE)}"producer\block"\
|
||||
{$(INCLUDE)}"producer\blockingqueue"\
|
||||
{$(INCLUDE)}"producer\camera"\
|
||||
{$(INCLUDE)}"producer\cameraconfig"\
|
||||
{$(INCLUDE)}"producer\cameragroup"\
|
||||
{$(INCLUDE)}"producer\export"\
|
||||
{$(INCLUDE)}"producer\inputarea"\
|
||||
{$(INCLUDE)}"producer\keyboard"\
|
||||
{$(INCLUDE)}"producer\keyboardmouse"\
|
||||
{$(INCLUDE)}"producer\math"\
|
||||
{$(INCLUDE)}"producer\referenced"\
|
||||
{$(INCLUDE)}"producer\refopenthread"\
|
||||
{$(INCLUDE)}"producer\rendersurface"\
|
||||
{$(INCLUDE)}"producer\timer"\
|
||||
{$(INCLUDE)}"producer\types"\
|
||||
{$(INCLUDE)}"producer\visualchooser"\
|
||||
|
||||
NODEP_CPP_OSGFX=\
|
||||
".\penthreads\barrier"\
|
||||
".\penthreads\condition"\
|
||||
".\penthreads\exports"\
|
||||
".\penthreads\mutex"\
|
||||
".\penthreads\thread"\
|
||||
".\roducer\block"\
|
||||
".\roducer\blockingqueue"\
|
||||
".\roducer\camera"\
|
||||
".\roducer\cameraconfig"\
|
||||
".\roducer\cameragroup"\
|
||||
".\roducer\export"\
|
||||
".\roducer\inputarea"\
|
||||
".\roducer\keyboard"\
|
||||
".\roducer\keyboardmouse"\
|
||||
".\roducer\math"\
|
||||
".\roducer\referenced"\
|
||||
".\roducer\refopenthread"\
|
||||
".\roducer\rendersurface"\
|
||||
".\roducer\timer"\
|
||||
".\roducer\types"\
|
||||
".\roducer\visualchooser"\
|
||||
|
||||
# End Source File
|
||||
# End Group
|
||||
|
||||
Reference in New Issue
Block a user