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

84
contrib/samples/ogl/studio/makefile.gcc
View File

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