Starting to update the tarball and rpm spec files for 2.5. Mostly

[wxWidgets.git] / contrib / samples / ogl / studio / makefile.vc

diff --git a/contrib/samples/ogl/studio/makefile.vc b/contrib/samples/ogl/studio/makefile.vc
index 7d8e92ce7fb26f46a169335f61403039ff78eeb3..b6c86629d67f176c7cc9d67bf13185b617984392 100644 (file)
--- a/contrib/samples/ogl/studio/makefile.vc
+++ b/contrib/samples/ogl/studio/makefile.vc
@@ -12,33 +12,38 @@
 
 ### Variables: ###
 
-LIBDIRNAME = \
-       .\..\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OGLEDIT_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) \
-       /DWIN32 $(__DEBUGINFO_0) /Fd$(OBJS)\ogledit.pdb $(____DEBUGRUNTIME_2_p) \
-       $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include /I$(LIBDIRNAME) \
-       /I.\..\..\..\..\src\tiff /I.\..\..\..\..\src\jpeg /I.\..\..\..\..\src\png \
-       /I.\..\..\..\..\src\zlib /I.\..\..\..\..\src\regex \
-       /I.\..\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS \
-       /I..\..\..\..\samples /I.\..\..\..\include $(CXXFLAGS)
-OGLEDIT_OBJECTS =  \
-       $(OBJS)\ogledit_studio.obj \
-       $(OBJS)\ogledit_doc.obj \
-       $(OBJS)\ogledit_shapes.obj \
-       $(OBJS)\ogledit_symbols.obj \
-       $(OBJS)\ogledit_view.obj \
-       $(OBJS)\ogledit_cspalette.obj \
-       $(OBJS)\ogledit_mainfrm.obj \
-       $(OBJS)\ogledit_project.obj \
-       $(OBJS)\ogledit_dialogs.obj \
-       $(OBJS)\ogledit_csprint.obj \
-       $(OBJS)\ogledit_studio.res
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+STUDIO_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
+       $(__DEBUGINFO_0) /Fd$(OBJS)\studio.pdb $(____DEBUGRUNTIME_2_p) \
+       $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include \
+       /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\..\..\..\samples \
+       /I.\..\..\..\include $(__EXCEPTIONSFLAG_8) $(__EXCEPTIONSFLAG_9) \
+       $(CPPFLAGS) $(CXXFLAGS)
+STUDIO_OBJECTS =  \
+       $(OBJS)\studio_studio.obj \
+       $(OBJS)\studio_doc.obj \
+       $(OBJS)\studio_shapes.obj \
+       $(OBJS)\studio_symbols.obj \
+       $(OBJS)\studio_view.obj \
+       $(OBJS)\studio_cspalette.obj \
+       $(OBJS)\studio_mainfrm.obj \
+       $(OBJS)\studio_project.obj \
+       $(OBJS)\studio_dialogs.obj \
+       $(OBJS)\studio_csprint.obj \
+       $(OBJS)\studio_studio.res
 
 ### Conditionally set variables: ###
 
+!if "$(SHARED)" == "0"
+LIBDIRNAME = .\..\..\..\..\lib\vc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = .\..\..\..\..\lib\vc_dll$(CFG)
+!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
@@ -123,6 +128,18 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /d WXUSINGDLL
 !endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_8 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_8 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_9 = 
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_9 = /GX
+!endif
 !if "$(USE_GUI)" == "1"
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !endif
@@ -132,6 +149,18 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !if "$(USE_GUI)" == "1"
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
 !if "$(BUILD)" == "debug"
 __OPTIMIZEFLAG_4 = /Od
 !endif
@@ -145,21 +174,29 @@ __RUNTIME_LIBS_7 = D
 __RUNTIME_LIBS_7 = T
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = /D_UNICODE
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=1
+__UNICODE_DEFINE_p_1 = /d _UNICODE
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
 !endif
 !if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_CORE_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 !endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_HTML_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html.lib
+!endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
        wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
@@ -220,51 +257,53 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\ogledit.exe data
+all: $(OBJS)\studio.exe data
 
-$(OBJS)\ogledit_cspalette.obj: .\cspalette.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
+$(OBJS)\studio_cspalette.obj: .\cspalette.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
 
-$(OBJS)\ogledit_csprint.obj: .\csprint.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
+$(OBJS)\studio_csprint.obj: .\csprint.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
 
-$(OBJS)\ogledit_dialogs.obj: .\dialogs.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
+$(OBJS)\studio_dialogs.obj: .\dialogs.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
 
-$(OBJS)\ogledit_doc.obj: .\doc.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
+$(OBJS)\studio_doc.obj: .\doc.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
 
-$(OBJS)\ogledit_mainfrm.obj: .\mainfrm.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
+$(OBJS)\studio_mainfrm.obj: .\mainfrm.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
 
-$(OBJS)\ogledit_project.obj: .\project.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
+$(OBJS)\studio_project.obj: .\project.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
 
-$(OBJS)\ogledit_shapes.obj: .\shapes.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
+$(OBJS)\studio_shapes.obj: .\shapes.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
 
-$(OBJS)\ogledit_studio.obj: .\studio.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
+$(OBJS)\studio_studio.obj: .\studio.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
 
-$(OBJS)\ogledit_studio.res: .\studio.rc
-       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(LIBDIRNAME) /i .\..\..\..\..\src\tiff /i .\..\..\..\..\src\jpeg /i .\..\..\..\..\src\png /i .\..\..\..\..\src\zlib  /i .\..\..\..\..\src\regex /i .\..\..\..\..\src\expat\lib /i . $(__DLLFLAG_p_1) /d _WINDOWS /i ..\..\..\..\samples /i .\..\..\..\include $**
+$(OBJS)\studio_studio.res: .\studio.rc
+       rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\..\..\samples /i .\..\..\..\include $**
 
-$(OBJS)\ogledit_symbols.obj: .\symbols.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
+$(OBJS)\studio_symbols.obj: .\symbols.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
 
-$(OBJS)\ogledit_view.obj: .\view.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(OGLEDIT_CXXFLAGS) $**
+$(OBJS)\studio_view.obj: .\view.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(STUDIO_CXXFLAGS) $**
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe
+       -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe
+       -if exist $(OBJS)\studio.ilk del $(OBJS)\studio.ilk
+       -if exist $(OBJS)\studio.pdb del $(OBJS)\studio.pdb
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
        for %f in (studio_resources.wxr) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
-$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_studio.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS  @<<
-       $(OGLEDIT_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
+$(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res
+       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
+       $(STUDIO_OBJECTS)  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib  $(__WXLIB_ADV_p)  $(__WXLIB_HTML_p)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib
 <<