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

82
contrib/samples/ogl/studio/makefile.bcc
View File

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