From 34f7e40fa9d501dd5fd0d61172f116f353af1a2c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 17 Aug 2003 11:14:08 +0000 Subject: [PATCH 1/1] Fixed compilation of OGL samples git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/ogl/basic.h | 1 + contrib/include/wx/ogl/ogldiag.h | 1 + contrib/samples/ogl/ogledit/ogledit.h | 1 + contrib/samples/ogl/ogledit/palette.h | 5 +- contrib/samples/ogl/studio/Makefile.in | 121 +++++----- contrib/samples/ogl/studio/mainfrm.cpp | 3 +- contrib/samples/ogl/studio/makefile.bcc | 82 +++---- contrib/samples/ogl/studio/makefile.gcc | 84 +++---- contrib/samples/ogl/studio/makefile.vc | 86 +++---- contrib/samples/ogl/studio/makefile.wat | 99 ++++---- contrib/samples/ogl/studio/studio.bkl | 4 +- contrib/samples/ogl/studio/studio.dsp | 294 ++++++++++++------------ contrib/samples/ogl/studio/studio.dsw | 35 ++- 13 files changed, 435 insertions(+), 381 deletions(-) diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h index 47b68d3de1..52d1b43fd0 100644 --- a/contrib/include/wx/ogl/basic.h +++ b/contrib/include/wx/ogl/basic.h @@ -16,6 +16,7 @@ #pragma interface "basic.h" #endif +#include #define OGL_VERSION 2.0 diff --git a/contrib/include/wx/ogl/ogldiag.h b/contrib/include/wx/ogl/ogldiag.h index 7a1b807b95..c1580a99c2 100644 --- a/contrib/include/wx/ogl/ogldiag.h +++ b/contrib/include/wx/ogl/ogldiag.h @@ -16,6 +16,7 @@ #pragma interface "ogldiag.h" #endif +#include #if wxUSE_PROLOGIO #include diff --git a/contrib/samples/ogl/ogledit/ogledit.h b/contrib/samples/ogl/ogledit/ogledit.h index b144f70b0a..0cc9ace370 100644 --- a/contrib/samples/ogl/ogledit/ogledit.h +++ b/contrib/samples/ogl/ogledit/ogledit.h @@ -17,6 +17,7 @@ #define _OGLSAMPLE_OGLEDIT_H_ #include +#include // Define a new application class MyFrame; diff --git a/contrib/samples/ogl/ogledit/palette.h b/contrib/samples/ogl/ogledit/palette.h index 5877981799..d49d7b4770 100644 --- a/contrib/samples/ogl/ogledit/palette.h +++ b/contrib/samples/ogl/ogledit/palette.h @@ -18,11 +18,8 @@ #include #include -#if 0 // def __WXGTK__ -#include -#else +#include #include -#endif /* * Object editor tool palette diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in index cb93844347..0ff8f53d54 100644 --- a/contrib/samples/ogl/studio/Makefile.in +++ b/contrib/samples/ogl/studio/Makefile.in @@ -34,21 +34,21 @@ top_srcdir = @top_srcdir@ ### Variables: ### LIBDIRNAME = $(top_builddir)lib -OGLEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ +STUDIO_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ -I$(srcdir)/../../../../samples -I$(srcdir)/../../../include $(CXXFLAGS) -OGLEDIT_OBJECTS = \ - ogledit_studio.o \ - ogledit_doc.o \ - ogledit_shapes.o \ - ogledit_symbols.o \ - ogledit_view.o \ - ogledit_cspalette.o \ - ogledit_mainfrm.o \ - ogledit_project.o \ - ogledit_dialogs.o \ - ogledit_csprint.o \ - $(__ogledit___win32rc) +STUDIO_OBJECTS = \ + studio_studio.o \ + studio_doc.o \ + studio_shapes.o \ + studio_symbols.o \ + studio_view.o \ + studio_cspalette.o \ + studio_mainfrm.o \ + studio_project.o \ + studio_dialogs.o \ + studio_csprint.o \ + $(__studio___win32rc) WX_VERSION = 2.5.0 ### Conditionally set variables: ### @@ -85,9 +85,12 @@ WX_VERSION = 2.5.0 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ $(__DLLFLAG_p_1) -i $(srcdir)/../../../../samples -i \ - $(srcdir)/../../../include -o ogledit$(EXEEXT) Carbon.r \ + $(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r \ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) +COND_MONOLITHIC_0___WXLIB_ADV_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) COND_MONOLITHIC_0___WXLIB_CORE_p = \ @@ -99,21 +102,21 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ -@COND_PLATFORM_MAC_1@__ogledit___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) -@COND_PLATFORM_MAC_1@__ogledit___mac_setfilecmd = \ -@COND_PLATFORM_MAC_1@ $(SETFILE) -a C ogledit$(EXEEXT) -@COND_PLATFORM_WIN32_1@__ogledit___win32rc = ogledit_studio_rc.o -@COND_PLATFORM_MACOSX_1@__ogledit_bundle___depname = ogledit_bundle +@COND_PLATFORM_MAC_1@__studio___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_PLATFORM_MAC_1@__studio___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C studio$(EXEEXT) +@COND_PLATFORM_WIN32_1@__studio___win32rc = studio_studio_rc.o +@COND_PLATFORM_MACOSX_1@__studio_bundle___depname = studio_bundle ### Targets: ### -all: ogledit$(EXEEXT) $(__ogledit_bundle___depname) data +all: studio$(EXEEXT) $(__studio_bundle___depname) data clean: rm -rf ./.deps ./.pch rm -f ./*.o - rm -f ogledit$(EXEEXT) - rm -rf ogledit.app + rm -f studio$(EXEEXT) + rm -rf studio.app data: @mkdir -p . @@ -130,67 +133,67 @@ install: all install-strip: install -ogledit$(EXEEXT): $(OGLEDIT_OBJECTS) $(__ogledit___win32rc) - $(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) - $(__ogledit___mac_rezcmd) - $(__ogledit___mac_setfilecmd) +studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc) + $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl-2.5$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated-2.5$(HOST_SUFFIX) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) + $(__studio___mac_rezcmd) + $(__studio___mac_setfilecmd) $(SAMPLES_RPATH_POSTLINK) -ogledit.app/Contents: ogledit$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns - mkdir -p ogledit.app/Contents - mkdir -p ogledit.app/Contents/MacOS - mkdir -p ogledit.app/Contents/Resources +studio.app/Contents: studio$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns + mkdir -p studio.app/Contents + mkdir -p studio.app/Contents/MacOS + mkdir -p studio.app/Contents/Resources sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ - -e "s/EXECUTABLE/ogledit/" \ + -e "s/EXECUTABLE/studio/" \ -e "s/VERSION/$(WX_VERSION)/" \ - $(top_srcdir)/src/mac/Info.plist.in >ogledit.app/Contents/Info.plist + $(top_srcdir)/src/mac/Info.plist.in >studio.app/Contents/Info.plist - echo -n "APPL????" >ogledit.app/Contents/PkgInfo + echo -n "APPL????" >studio.app/Contents/PkgInfo - ln -f ogledit$(EXEEXT) ogledit.app/Contents/MacOS/ogledit + ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio - ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc ogledit.app/Contents/Resources/ogledit.rsrc - ln -f $(top_srcdir)/src/mac/wxmac.icns ogledit.app/Contents/Resources/wxmac.icns + ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc studio.app/Contents/Resources/studio.rsrc + ln -f $(top_srcdir)/src/mac/wxmac.icns studio.app/Contents/Resources/wxmac.icns -@COND_PLATFORM_MACOSX_1@ogledit_bundle: ogledit.app/Contents +@COND_PLATFORM_MACOSX_1@studio_bundle: studio.app/Contents -ogledit_cspalette.o: $(srcdir)/cspalette.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +studio_cspalette.o: $(srcdir)/cspalette.cpp + $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< -ogledit_csprint.o: $(srcdir)/csprint.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +studio_csprint.o: $(srcdir)/csprint.cpp + $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< -ogledit_dialogs.o: $(srcdir)/dialogs.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +studio_dialogs.o: $(srcdir)/dialogs.cpp + $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< -ogledit_doc.o: $(srcdir)/doc.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +studio_doc.o: $(srcdir)/doc.cpp + $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< -ogledit_mainfrm.o: $(srcdir)/mainfrm.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +studio_mainfrm.o: $(srcdir)/mainfrm.cpp + $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< -ogledit_project.o: $(srcdir)/project.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +studio_project.o: $(srcdir)/project.cpp + $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< -ogledit_shapes.o: $(srcdir)/shapes.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +studio_shapes.o: $(srcdir)/shapes.cpp + $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< -ogledit_studio.o: $(srcdir)/studio.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +studio_studio.o: $(srcdir)/studio.cpp + $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< -ogledit_studio_rc.o: $(srcdir)/studio.rc +studio_studio_rc.o: $(srcdir)/studio.rc $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../../samples --include-dir $(srcdir)/../../../include -ogledit_symbols.o: $(srcdir)/symbols.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +studio_symbols.o: $(srcdir)/symbols.cpp + $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< -ogledit_view.o: $(srcdir)/view.cpp - $(CXXC) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +studio_view.o: $(srcdir)/view.cpp + $(CXXC) -c -o $@ $(STUDIO_CXXFLAGS) $< uninstall: @@ -198,4 +201,4 @@ uninstall: # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all clean data distclean install ogledit_bundle uninstall +.PHONY: all clean data distclean install studio_bundle uninstall diff --git a/contrib/samples/ogl/studio/mainfrm.cpp b/contrib/samples/ogl/studio/mainfrm.cpp index c1d856c301..7cf28d4a6a 100644 --- a/contrib/samples/ogl/studio/mainfrm.cpp +++ b/contrib/samples/ogl/studio/mainfrm.cpp @@ -150,8 +150,6 @@ void csFrame::OnSize(wxSizeEvent& event) // Make sure the correct toolbars are showing for the active view void csFrame::OnIdle(wxIdleEvent& event) { - wxDocMDIParentFrame::OnIdle(event); - wxSashLayoutWindow* paletteWin = wxGetApp().GetDiagramPaletteSashWindow(); wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow(); if (!paletteWin || !diagramToolBarWin) @@ -201,6 +199,7 @@ void csFrame::OnIdle(wxIdleEvent& event) #endif #endif } + event.Skip(); } // General handler for disabling items diff --git a/contrib/samples/ogl/studio/makefile.bcc b/contrib/samples/ogl/studio/makefile.bcc index 69b0203080..a42b2dc357 100644 --- a/contrib/samples/ogl/studio/makefile.bcc +++ b/contrib/samples/ogl/studio/makefile.bcc @@ -22,24 +22,24 @@ BCCDIR = $(MAKEDIR)\.. OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \ +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +STUDIO_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \ $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include \ -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -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 -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +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 ### Conditionally set variables: ### @@ -137,6 +137,10 @@ __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=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" @@ -161,51 +165,51 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\ogledit.exe data +all: $(OBJS)\studio.exe data -$(OBJS)\ogledit_cspalette.obj: .\cspalette.cpp - $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $** +$(OBJS)\studio_cspalette.obj: .\cspalette.cpp + $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $** -$(OBJS)\ogledit_csprint.obj: .\csprint.cpp - $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $** +$(OBJS)\studio_csprint.obj: .\csprint.cpp + $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $** -$(OBJS)\ogledit_dialogs.obj: .\dialogs.cpp - $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $** +$(OBJS)\studio_dialogs.obj: .\dialogs.cpp + $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $** -$(OBJS)\ogledit_doc.obj: .\doc.cpp - $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $** +$(OBJS)\studio_doc.obj: .\doc.cpp + $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $** -$(OBJS)\ogledit_mainfrm.obj: .\mainfrm.cpp - $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $** +$(OBJS)\studio_mainfrm.obj: .\mainfrm.cpp + $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $** -$(OBJS)\ogledit_project.obj: .\project.cpp - $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $** +$(OBJS)\studio_project.obj: .\project.cpp + $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $** -$(OBJS)\ogledit_shapes.obj: .\shapes.cpp - $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $** +$(OBJS)\studio_shapes.obj: .\shapes.cpp + $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $** -$(OBJS)\ogledit_studio.obj: .\studio.cpp - $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $** +$(OBJS)\studio_studio.obj: .\studio.cpp + $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $** -$(OBJS)\ogledit_studio.res: .\studio.rc +$(OBJS)\studio_studio.res: .\studio.rc brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\..\samples -i.\..\..\..\include $** -$(OBJS)\ogledit_symbols.obj: .\symbols.cpp - $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $** +$(OBJS)\studio_symbols.obj: .\symbols.cpp + $(CXX) -q -c -P -o$@ $(STUDIO_CXXFLAGS) $** -$(OBJS)\ogledit_view.obj: .\view.cpp - $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $** +$(OBJS)\studio_view.obj: .\view.cpp + $(CXX) -q -c -P -o$@ $(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 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 +$(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| - c0w32.obj $(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) import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\ogledit_studio.res + c0w32.obj $(STUDIO_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_ADV_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) import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\studio_studio.res | diff --git a/contrib/samples/ogl/studio/makefile.gcc b/contrib/samples/ogl/studio/makefile.gcc index 2ecf414f5f..986ab18a83 100644 --- a/contrib/samples/ogl/studio/makefile.gcc +++ b/contrib/samples/ogl/studio/makefile.gcc @@ -14,24 +14,24 @@ include ../../../../build/msw/config.gcc OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +STUDIO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -I. \ $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) -OGLEDIT_OBJECTS = \ - $(OBJS)\ogledit_studio.o \ - $(OBJS)\ogledit_doc.o \ - $(OBJS)\ogledit_shapes.o \ - $(OBJS)\ogledit_symbols.o \ - $(OBJS)\ogledit_view.o \ - $(OBJS)\ogledit_cspalette.o \ - $(OBJS)\ogledit_mainfrm.o \ - $(OBJS)\ogledit_project.o \ - $(OBJS)\ogledit_dialogs.o \ - $(OBJS)\ogledit_csprint.o \ - $(OBJS)\ogledit_studio_rc.o -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +STUDIO_OBJECTS = \ + $(OBJS)\studio_studio.o \ + $(OBJS)\studio_doc.o \ + $(OBJS)\studio_shapes.o \ + $(OBJS)\studio_symbols.o \ + $(OBJS)\studio_view.o \ + $(OBJS)\studio_cspalette.o \ + $(OBJS)\studio_mainfrm.o \ + $(OBJS)\studio_project.o \ + $(OBJS)\studio_dialogs.o \ + $(OBJS)\studio_csprint.o \ + $(OBJS)\studio_studio_rc.o ### Conditionally set variables: ### @@ -130,6 +130,10 @@ ifeq ($(MSLU),1) __UNICOWS_LIB_p = -lunicows endif ifeq ($(MONOLITHIC),0) +__WXLIB_ADV_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv +endif +ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG) endif ifeq ($(MONOLITHIC),0) @@ -154,50 +158,50 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\ogledit.exe data +all: $(OBJS)\studio.exe data -$(OBJS)\ogledit_cspalette.o: .\cspalette.cpp - $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_cspalette.o: .\cspalette.cpp + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_csprint.o: .\csprint.cpp - $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_csprint.o: .\csprint.cpp + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_dialogs.o: .\dialogs.cpp - $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_dialogs.o: .\dialogs.cpp + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_doc.o: .\doc.cpp - $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_doc.o: .\doc.cpp + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_mainfrm.o: .\mainfrm.cpp - $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_mainfrm.o: .\mainfrm.cpp + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_project.o: .\project.cpp - $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_project.o: .\project.cpp + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_shapes.o: .\shapes.cpp - $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_shapes.o: .\shapes.cpp + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_studio.o: .\studio.cpp - $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_studio.o: .\studio.cpp + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_studio_rc.o: .\studio.rc +$(OBJS)\studio_studio_rc.o: .\studio.rc windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples --include-dir ./../../../include -$(OBJS)\ogledit_symbols.o: .\symbols.cpp - $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_symbols.o: .\symbols.cpp + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_view.o: .\view.cpp - $(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_view.o: .\view.cpp + $(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $< clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe + -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe 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_rc.o - $(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 +$(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_studio_rc.o + $(CXX) -o $@ $(STUDIO_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 .PHONY: all clean data diff --git a/contrib/samples/ogl/studio/makefile.vc b/contrib/samples/ogl/studio/makefile.vc index e99572e7c5..c2143bace0 100644 --- a/contrib/samples/ogl/studio/makefile.vc +++ b/contrib/samples/ogl/studio/makefile.vc @@ -14,26 +14,26 @@ 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) \ +SETUPHDIR = \ + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +STUDIO_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ + $(__DEBUGINFO_0) /Fd$(OBJS)\studio.pdb $(____DEBUGRUNTIME_2_p) \ $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) /I.\..\..\..\..\include /I$(SETUPHDIR) /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_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: ### @@ -158,6 +158,10 @@ __UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=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" @@ -224,51 +228,51 @@ $(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 +$(OBJS)\studio_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 $(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 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 +$(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_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 + $(STUDIO_OBJECTS) wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_ADV_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 << diff --git a/contrib/samples/ogl/studio/makefile.wat b/contrib/samples/ogl/studio/makefile.wat index bb1ecbe6fe..1009b80bf5 100644 --- a/contrib/samples/ogl/studio/makefile.wat +++ b/contrib/samples/ogl/studio/makefile.wat @@ -139,6 +139,11 @@ __UNICODE_DEFINE_p = !ifeq UNICODE 1 __UNICODE_DEFINE_p = -dwxUSE_UNICODE=1 !endif +__WXLIB_ADV_p = +!ifeq MONOLITHIC 0 +__WXLIB_ADV_p = & + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib +!endif __WXLIB_BASE_p = !ifeq MONOLITHIC 0 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib @@ -162,23 +167,23 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ OBJS = & wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & +SETUPHDIR = & + $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +STUDIO_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm & $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. & $(__DLLFLAG_p) -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 -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) +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 all : $(OBJS) @@ -187,59 +192,59 @@ $(OBJS) : ### Targets: ### -all : .SYMBOLIC $(OBJS)\ogledit.exe data +all : .SYMBOLIC $(OBJS)\studio.exe data -$(OBJS)\ogledit_cspalette.obj : .AUTODEPEND .\cspalette.cpp - $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_cspalette.obj : .AUTODEPEND .\cspalette.cpp + $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_csprint.obj : .AUTODEPEND .\csprint.cpp - $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_csprint.obj : .AUTODEPEND .\csprint.cpp + $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_dialogs.obj : .AUTODEPEND .\dialogs.cpp - $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_dialogs.obj : .AUTODEPEND .\dialogs.cpp + $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_doc.obj : .AUTODEPEND .\doc.cpp - $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_doc.obj : .AUTODEPEND .\doc.cpp + $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_mainfrm.obj : .AUTODEPEND .\mainfrm.cpp - $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_mainfrm.obj : .AUTODEPEND .\mainfrm.cpp + $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_project.obj : .AUTODEPEND .\project.cpp - $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_project.obj : .AUTODEPEND .\project.cpp + $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_shapes.obj : .AUTODEPEND .\shapes.cpp - $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_shapes.obj : .AUTODEPEND .\shapes.cpp + $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_studio.obj : .AUTODEPEND .\studio.cpp - $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_studio.obj : .AUTODEPEND .\studio.cpp + $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_studio.res : .AUTODEPEND .\studio.rc +$(OBJS)\studio_studio.res : .AUTODEPEND .\studio.rc wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $< -$(OBJS)\ogledit_symbols.obj : .AUTODEPEND .\symbols.cpp - $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_symbols.obj : .AUTODEPEND .\symbols.cpp + $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< -$(OBJS)\ogledit_view.obj : .AUTODEPEND .\view.cpp - $(CXX) -zq -fo=$^@ $(OGLEDIT_CXXFLAGS) $< +$(OBJS)\studio_view.obj : .AUTODEPEND .\view.cpp + $(CXX) -zq -fo=$^@ $(STUDIO_CXXFLAGS) $< clean : .SYMBOLIC -if exist $(OBJS)\*.obj del $(OBJS)\*.obj -if exist $(OBJS)\*.res del $(OBJS)\*.res -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe + -if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe data : .SYMBOLIC 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 - @%create $(OBJS)\ogledit.lbc - @%append $(OBJS)\ogledit.lbc option quiet - @%append $(OBJS)\ogledit.lbc name $^@ - @%append $(OBJS)\ogledit.lbc option caseexact - @%append $(OBJS)\ogledit.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' - @for %i in ($(OGLEDIT_OBJECTS)) do @%append $(OBJS)\ogledit.lbc file %i - @for %i in ( 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 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 ) do @%append $(OBJS)\ogledit.lbc library %i - @%append $(OBJS)\ogledit.lbc option resource=$(OBJS)\ogledit_studio.res - wlink @$(OBJS)\ogledit.lbc +$(OBJS)\studio.exe : $(STUDIO_OBJECTS) $(OBJS)\studio_studio.res + @%create $(OBJS)\studio.lbc + @%append $(OBJS)\studio.lbc option quiet + @%append $(OBJS)\studio.lbc name $^@ + @%append $(OBJS)\studio.lbc option incremental + @%append $(OBJS)\studio.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' + @for %i in ($(STUDIO_OBJECTS)) do @%append $(OBJS)\studio.lbc file %i + @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__WXLIB_ADV_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 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 ) do @%append $(OBJS)\studio.lbc library %i + @%append $(OBJS)\studio.lbc option resource=$(OBJS)\studio_studio.res + wlink @$(OBJS)\studio.lbc diff --git a/contrib/samples/ogl/studio/studio.bkl b/contrib/samples/ogl/studio/studio.bkl index ba23e7d21c..576f7c7a16 100644 --- a/contrib/samples/ogl/studio/studio.bkl +++ b/contrib/samples/ogl/studio/studio.bkl @@ -5,7 +5,7 @@ $(SRCDIR)/../../../include - + studio.cpp doc.cpp @@ -19,6 +19,8 @@ csprint.cpp ogl + deprecated + adv core base studio.rc diff --git a/contrib/samples/ogl/studio/studio.dsp b/contrib/samples/ogl/studio/studio.dsp index 3e52a7b400..215bd75a86 100644 --- a/contrib/samples/ogl/studio/studio.dsp +++ b/contrib/samples/ogl/studio/studio.dsp @@ -1,10 +1,10 @@ -# Microsoft Developer Studio Project File - Name="ogledit" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="studio" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Application" 0x0101 -CFG=ogledit - Win32 DLL Release +CFG=studio - Win32 DLL Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,26 +13,26 @@ CFG=ogledit - Win32 DLL Release !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 "studio.mak" CFG="ogledit - Win32 DLL Release" +!MESSAGE NMAKE /f "studio.mak" CFG="studio - Win32 DLL Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "ogledit - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 Unicode Debug" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 Unicode Release" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 Universal Debug" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 Universal Release" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 Universal Unicode Release" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 DLL Debug" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 DLL Release" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 DLL Universal Debug" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 DLL Universal Release" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application") -!MESSAGE "ogledit - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 Universal Debug" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 Universal Release" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 Universal Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 DLL Debug" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 DLL Release" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 DLL Universal Debug" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 DLL Universal Release" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "studio - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application") !MESSAGE # Begin Project @@ -43,20 +43,20 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "ogledit - Win32 Debug" +!IF "$(CFG)" == "studio - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswd" -# PROP BASE Intermediate_Dir "vc_mswd\ogledit" +# PROP BASE Intermediate_Dir "vc_mswd\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswd" -# PROP Intermediate_Dir "vc_mswd\ogledit" +# PROP Intermediate_Dir "vc_mswd\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswd\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswd" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -65,23 +65,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw25d_ogl.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswd\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw25d_ogl.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswd\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmsw25d_ogl.lib wxmsw25d_deprecated.lib wxmsw25d_adv.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswd\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw25d_ogl.lib wxmsw25d_deprecated.lib wxmsw25d_adv.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswd\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 Release" +!ELSEIF "$(CFG)" == "studio - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_msw" -# PROP BASE Intermediate_Dir "vc_msw\ogledit" +# PROP BASE Intermediate_Dir "vc_msw\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_msw" -# PROP Intermediate_Dir "vc_msw\ogledit" +# PROP Intermediate_Dir "vc_msw\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\msw" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\msw" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_msw\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\msw" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MD /Fdvc_msw\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\msw" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\msw" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -90,23 +90,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw25_ogl.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_msw\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw25_ogl.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_msw\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmsw25_ogl.lib wxmsw25_deprecated.lib wxmsw25_adv.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_msw\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw25_ogl.lib wxmsw25_deprecated.lib wxmsw25_adv.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_msw\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 Unicode Debug" +!ELSEIF "$(CFG)" == "studio - Win32 Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswud" -# PROP BASE Intermediate_Dir "vc_mswud\ogledit" +# PROP BASE Intermediate_Dir "vc_mswud\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswud" -# PROP Intermediate_Dir "vc_mswud\ogledit" +# PROP Intermediate_Dir "vc_mswud\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswud\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswud" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -115,23 +115,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw25ud_ogl.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswud\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw25ud_ogl.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswud\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmsw25ud_ogl.lib wxmsw25ud_deprecated.lib wxmsw25ud_adv.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswud\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw25ud_ogl.lib wxmsw25ud_deprecated.lib wxmsw25ud_adv.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswud\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 Unicode Release" +!ELSEIF "$(CFG)" == "studio - Win32 Unicode Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_mswu" -# PROP BASE Intermediate_Dir "vc_mswu\ogledit" +# PROP BASE Intermediate_Dir "vc_mswu\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_mswu" -# PROP Intermediate_Dir "vc_mswu\ogledit" +# PROP Intermediate_Dir "vc_mswu\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswu\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswu\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswu" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -140,23 +140,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw25u_ogl.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswu\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmsw25u_ogl.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswu\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmsw25u_ogl.lib wxmsw25u_deprecated.lib wxmsw25u_adv.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswu\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw25u_ogl.lib wxmsw25u_deprecated.lib wxmsw25u_adv.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswu\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 Universal Debug" +!ELSEIF "$(CFG)" == "studio - Win32 Universal Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswunivd" -# PROP BASE Intermediate_Dir "vc_mswunivd\ogledit" +# PROP BASE Intermediate_Dir "vc_mswunivd\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswunivd" -# PROP Intermediate_Dir "vc_mswunivd\ogledit" +# PROP Intermediate_Dir "vc_mswunivd\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivd\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswunivd" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -165,23 +165,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmswuniv25d_ogl.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivd\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv25d_ogl.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivd\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmswuniv25d_ogl.lib wxmswuniv25d_deprecated.lib wxmswuniv25d_adv.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivd\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv25d_ogl.lib wxmswuniv25d_deprecated.lib wxmswuniv25d_adv.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivd\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 Universal Release" +!ELSEIF "$(CFG)" == "studio - Win32 Universal Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_mswuniv" -# PROP BASE Intermediate_Dir "vc_mswuniv\ogledit" +# PROP BASE Intermediate_Dir "vc_mswuniv\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_mswuniv" -# PROP Intermediate_Dir "vc_mswuniv\ogledit" +# PROP Intermediate_Dir "vc_mswuniv\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswuniv\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswuniv" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswuniv" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -190,23 +190,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmswuniv25_ogl.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswuniv\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv25_ogl.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswuniv\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmswuniv25_ogl.lib wxmswuniv25_deprecated.lib wxmswuniv25_adv.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswuniv\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv25_ogl.lib wxmswuniv25_deprecated.lib wxmswuniv25_adv.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswuniv\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 Universal Unicode Debug" +!ELSEIF "$(CFG)" == "studio - Win32 Universal Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswunivud" -# PROP BASE Intermediate_Dir "vc_mswunivud\ogledit" +# PROP BASE Intermediate_Dir "vc_mswunivud\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswunivud" -# PROP Intermediate_Dir "vc_mswunivud\ogledit" +# PROP Intermediate_Dir "vc_mswunivud\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivud\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswunivud" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -215,23 +215,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmswuniv25ud_ogl.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivud\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv25ud_ogl.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivud\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmswuniv25ud_ogl.lib wxmswuniv25ud_deprecated.lib wxmswuniv25ud_adv.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivud\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv25ud_ogl.lib wxmswuniv25ud_deprecated.lib wxmswuniv25ud_adv.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivud\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 Universal Unicode Release" +!ELSEIF "$(CFG)" == "studio - Win32 Universal Unicode Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_mswunivu" -# PROP BASE Intermediate_Dir "vc_mswunivu\ogledit" +# PROP BASE Intermediate_Dir "vc_mswunivu\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_mswunivu" -# PROP Intermediate_Dir "vc_mswunivu\ogledit" +# PROP Intermediate_Dir "vc_mswunivu\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivu\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_lib\mswunivu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_lib\mswunivu" /i "." /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -240,23 +240,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmswuniv25u_ogl.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivu\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -# ADD LINK32 wxmswuniv25u_ogl.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivu\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD BASE LINK32 wxmswuniv25u_ogl.lib wxmswuniv25u_deprecated.lib wxmswuniv25u_adv.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivu\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv25u_ogl.lib wxmswuniv25u_deprecated.lib wxmswuniv25u_adv.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivu\studio.exe" /libpath:".\..\..\..\..\lib\vc_lib" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Debug" +!ELSEIF "$(CFG)" == "studio - Win32 DLL Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswddll" -# PROP BASE Intermediate_Dir "vc_mswddll\ogledit" +# PROP BASE Intermediate_Dir "vc_mswddll\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswddll" -# PROP Intermediate_Dir "vc_mswddll\ogledit" +# PROP Intermediate_Dir "vc_mswddll\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswddll\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswd" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -265,23 +265,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw25d_ogl.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw25d_ogl.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmsw25d_ogl.lib wxmsw25d_deprecated.lib wxmsw25d_adv.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw25d_ogl.lib wxmsw25d_deprecated.lib wxmsw25d_adv.lib wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Release" +!ELSEIF "$(CFG)" == "studio - Win32 DLL Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_mswdll" -# PROP BASE Intermediate_Dir "vc_mswdll\ogledit" +# PROP BASE Intermediate_Dir "vc_mswdll\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_mswdll" -# PROP Intermediate_Dir "vc_mswdll\ogledit" +# PROP Intermediate_Dir "vc_mswdll\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\msw" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\msw" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswdll\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\msw" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswdll\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\msw" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\msw" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -290,23 +290,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw25_ogl.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswdll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw25_ogl.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswdll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmsw25_ogl.lib wxmsw25_deprecated.lib wxmsw25_adv.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswdll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw25_ogl.lib wxmsw25_deprecated.lib wxmsw25_adv.lib wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswdll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Unicode Debug" +!ELSEIF "$(CFG)" == "studio - Win32 DLL Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswuddll" -# PROP BASE Intermediate_Dir "vc_mswuddll\ogledit" +# PROP BASE Intermediate_Dir "vc_mswuddll\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswuddll" -# PROP Intermediate_Dir "vc_mswuddll\ogledit" +# PROP Intermediate_Dir "vc_mswuddll\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswuddll\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswud" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -315,23 +315,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw25ud_ogl.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswuddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw25ud_ogl.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswuddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmsw25ud_ogl.lib wxmsw25ud_deprecated.lib wxmsw25ud_adv.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswuddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw25ud_ogl.lib wxmsw25ud_deprecated.lib wxmsw25ud_adv.lib wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswuddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Unicode Release" +!ELSEIF "$(CFG)" == "studio - Win32 DLL Unicode Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_mswudll" -# PROP BASE Intermediate_Dir "vc_mswudll\ogledit" +# PROP BASE Intermediate_Dir "vc_mswudll\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_mswudll" -# PROP Intermediate_Dir "vc_mswudll\ogledit" +# PROP Intermediate_Dir "vc_mswudll\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswudll\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswudll\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswu" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -340,23 +340,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmsw25u_ogl.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswudll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmsw25u_ogl.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswudll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmsw25u_ogl.lib wxmsw25u_deprecated.lib wxmsw25u_adv.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswudll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw25u_ogl.lib wxmsw25u_deprecated.lib wxmsw25u_adv.lib wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswudll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Universal Debug" +!ELSEIF "$(CFG)" == "studio - Win32 DLL Universal Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswunivddll" -# PROP BASE Intermediate_Dir "vc_mswunivddll\ogledit" +# PROP BASE Intermediate_Dir "vc_mswunivddll\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswunivddll" -# PROP Intermediate_Dir "vc_mswunivddll\ogledit" +# PROP Intermediate_Dir "vc_mswunivddll\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivd" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswunivd" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -365,23 +365,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmswuniv25d_ogl.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv25d_ogl.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmswuniv25d_ogl.lib wxmswuniv25d_deprecated.lib wxmswuniv25d_adv.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv25d_ogl.lib wxmswuniv25d_deprecated.lib wxmswuniv25d_adv.lib wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Universal Release" +!ELSEIF "$(CFG)" == "studio - Win32 DLL Universal Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_mswunivdll" -# PROP BASE Intermediate_Dir "vc_mswunivdll\ogledit" +# PROP BASE Intermediate_Dir "vc_mswunivdll\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_mswunivdll" -# PROP Intermediate_Dir "vc_mswunivdll\ogledit" +# PROP Intermediate_Dir "vc_mswunivdll\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivdll\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswuniv" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswuniv" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -390,23 +390,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmswuniv25_ogl.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivdll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv25_ogl.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivdll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmswuniv25_ogl.lib wxmswuniv25_deprecated.lib wxmswuniv25_adv.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivdll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv25_ogl.lib wxmswuniv25_deprecated.lib wxmswuniv25_adv.lib wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivdll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Universal Unicode Debug" +!ELSEIF "$(CFG)" == "studio - Win32 DLL Universal Unicode Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "vc_mswunivuddll" -# PROP BASE Intermediate_Dir "vc_mswunivuddll\ogledit" +# PROP BASE Intermediate_Dir "vc_mswunivuddll\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "vc_mswunivuddll" -# PROP Intermediate_Dir "vc_mswunivuddll\ogledit" +# PROP Intermediate_Dir "vc_mswunivuddll\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\ogledit.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\studio.pdb /Od /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivud" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswunivud" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -415,23 +415,23 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmswuniv25ud_ogl.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivuddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv25ud_ogl.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivuddll\ogledit.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmswuniv25ud_ogl.lib wxmswuniv25ud_deprecated.lib wxmswuniv25ud_adv.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivuddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv25ud_ogl.lib wxmswuniv25ud_deprecated.lib wxmswuniv25ud_adv.lib wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.lib 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 /nologo /machine:i386 /out:"vc_mswunivuddll\studio.exe" /debug /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -!ELSEIF "$(CFG)" == "ogledit - Win32 DLL Universal Unicode Release" +!ELSEIF "$(CFG)" == "studio - Win32 DLL Universal Unicode Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "vc_mswunivudll" -# PROP BASE Intermediate_Dir "vc_mswunivudll\ogledit" +# PROP BASE Intermediate_Dir "vc_mswunivudll\studio" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "vc_mswunivudll" -# PROP Intermediate_Dir "vc_mswunivudll\ogledit" +# PROP Intermediate_Dir "vc_mswunivudll\studio" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c -# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\ogledit.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD BASE CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c +# ADD CPP /nologo /FD /W4 /MD /Fdvc_mswunivudll\studio.pdb /O1 /I ".\..\..\..\..\include" /I ".\..\..\..\..\lib\vc_dll\mswunivu" /I "." /I ".\..\..\..\..\samples" /I ".\..\..\..\include" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /c # ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "_WINDOWS" /mktyplib203 /win32 # ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i ".\..\..\..\..\include" /i ".\..\..\..\..\lib\vc_dll\mswunivu" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\..\..\samples" /i .\..\..\..\include @@ -440,29 +440,29 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 wxmswuniv25u_ogl.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivudll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows -# ADD LINK32 wxmswuniv25u_ogl.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivudll\ogledit.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD BASE LINK32 wxmswuniv25u_ogl.lib wxmswuniv25u_deprecated.lib wxmswuniv25u_adv.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivudll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv25u_ogl.lib wxmswuniv25u_deprecated.lib wxmswuniv25u_adv.lib wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.lib 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 /nologo /machine:i386 /out:"vc_mswunivudll\studio.exe" /libpath:".\..\..\..\..\lib\vc_dll" /subsystem:windows !ENDIF # Begin Target -# Name "ogledit - Win32 Debug" -# Name "ogledit - Win32 Release" -# Name "ogledit - Win32 Unicode Debug" -# Name "ogledit - Win32 Unicode Release" -# Name "ogledit - Win32 Universal Debug" -# Name "ogledit - Win32 Universal Release" -# Name "ogledit - Win32 Universal Unicode Debug" -# Name "ogledit - Win32 Universal Unicode Release" -# Name "ogledit - Win32 DLL Debug" -# Name "ogledit - Win32 DLL Release" -# Name "ogledit - Win32 DLL Unicode Debug" -# Name "ogledit - Win32 DLL Unicode Release" -# Name "ogledit - Win32 DLL Universal Debug" -# Name "ogledit - Win32 DLL Universal Release" -# Name "ogledit - Win32 DLL Universal Unicode Debug" -# Name "ogledit - Win32 DLL Universal Unicode Release" +# Name "studio - Win32 Debug" +# Name "studio - Win32 Release" +# Name "studio - Win32 Unicode Debug" +# Name "studio - Win32 Unicode Release" +# Name "studio - Win32 Universal Debug" +# Name "studio - Win32 Universal Release" +# Name "studio - Win32 Universal Unicode Debug" +# Name "studio - Win32 Universal Unicode Release" +# Name "studio - Win32 DLL Debug" +# Name "studio - Win32 DLL Release" +# Name "studio - Win32 DLL Unicode Debug" +# Name "studio - Win32 DLL Unicode Release" +# Name "studio - Win32 DLL Universal Debug" +# Name "studio - Win32 DLL Universal Release" +# Name "studio - Win32 DLL Universal Unicode Debug" +# Name "studio - Win32 DLL Universal Unicode Release" # Begin Group "Source Files" # PROP Default_Filter "" diff --git a/contrib/samples/ogl/studio/studio.dsw b/contrib/samples/ogl/studio/studio.dsw index 083b0a4b7d..9086d23dd6 100644 --- a/contrib/samples/ogl/studio/studio.dsw +++ b/contrib/samples/ogl/studio/studio.dsw @@ -14,6 +14,33 @@ Package=<4> ############################################################################### +Project: "deprecated"=..\..\..\..\build\msw\wx_deprecated.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "adv"=..\..\..\..\build\msw\wx_adv.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +Begin Project Dependency +Project_Dep_Name core +End Project Dependency +}}} + +############################################################################### + Project: "core"=..\..\..\..\build\msw\wx_core.dsp - Package Owner=<4> Package=<5> @@ -41,7 +68,7 @@ Package=<4> ############################################################################### -Project: "ogledit"=studio.dsp - Package Owner=<4> +Project: "studio"=studio.dsp - Package Owner=<4> Package=<5> {{{ @@ -53,6 +80,12 @@ Begin Project Dependency Project_Dep_Name ogl End Project Dependency Begin Project Dependency +Project_Dep_Name deprecated +End Project Dependency +Begin Project Dependency +Project_Dep_Name adv +End Project Dependency +Begin Project Dependency Project_Dep_Name core End Project Dependency Begin Project Dependency -- 2.45.2