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

99
contrib/samples/ogl/studio/makefile.wat
View File

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