Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation of OGL samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-08-17 11:14:08 +00:00
parent c80217d107
commit 34f7e40fa9
13 changed files with 435 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
contrib/samples/ogl/studio/makefile.vc
View File

@@ -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
<<