Moved version number to 2.7.2.0 and rebaked
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
@@ -39,7 +39,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.7
|
||||
WX_VERSION = $(WX_RELEASE).1
|
||||
WX_VERSION = $(WX_RELEASE).2
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
|
||||
@@ -1,35 +1,71 @@
|
||||
#
|
||||
# File: makefile.unx
|
||||
# Author: Julian Smart
|
||||
# Created: 1998
|
||||
# Updated:
|
||||
# Copyright: (c) 1998 Julian Smart
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile for cube example (UNIX).
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
OPENGL_LIBS=-lGL -lGLU
|
||||
#if you have old Mesa, try this:
|
||||
#OPENGL_LIBS=-lMesaGL -lMesaGLU
|
||||
|
||||
PROGRAM=cube
|
||||
|
||||
CXX = $(shell wx-config --cxx)
|
||||
# -------------------------------------------------------------------------
|
||||
# These are configurable options:
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
OBJECTS = $(PROGRAM).o
|
||||
# C++ compiler
|
||||
CXX = g++
|
||||
|
||||
# implementation
|
||||
# Standard flags for C++
|
||||
CXXFLAGS =
|
||||
|
||||
.SUFFIXES: .o .cpp
|
||||
# Standard preprocessor flags (common for CC and CXX)
|
||||
CPPFLAGS =
|
||||
|
||||
.cpp.o :
|
||||
$(CXX) -c `wx-config --cxxflags` -o $@ $<
|
||||
# Standard linker flags
|
||||
LDFLAGS =
|
||||
|
||||
all: $(PROGRAM)
|
||||
# Location and arguments of wx-config script
|
||||
WX_CONFIG = wx-config
|
||||
|
||||
$(PROGRAM): $(OBJECTS)
|
||||
$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
|
||||
# C++ flags to use with wxWidgets code
|
||||
WX_CXXFLAGS = `$(WX_CONFIG) --cxxflags`
|
||||
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Do not modify the rest of this file!
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
### Variables: ###
|
||||
|
||||
CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
|
||||
CUBE_CXXFLAGS = -I. $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
|
||||
CUBE_OBJECTS = \
|
||||
cube_cube.o
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: cube
|
||||
|
||||
install: all
|
||||
|
||||
uninstall:
|
||||
|
||||
clean:
|
||||
rm -f *.o $(PROGRAM)
|
||||
rm -f ./*.o
|
||||
rm -f ./*.d
|
||||
rm -f cube
|
||||
|
||||
cube: $(CUBE_OBJECTS)
|
||||
$(CXX) -o $@ $(CUBE_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) --libs gl,core,base`
|
||||
|
||||
cube_cube.o: ./cube.cpp
|
||||
$(CXX) -c -o $@ $(CUBE_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
.PHONY: all install uninstall clean
|
||||
|
||||
|
||||
# Dependencies tracking:
|
||||
-include ./*.d
|
||||
|
||||
@@ -39,7 +39,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.7
|
||||
WX_VERSION = $(WX_RELEASE).1
|
||||
WX_VERSION = $(WX_RELEASE).2
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
|
||||
@@ -1,39 +1,71 @@
|
||||
#
|
||||
# File: makefile.unx
|
||||
# Author: Julian Smart
|
||||
# Created: 1998
|
||||
# Updated:
|
||||
# Copyright: (c) 1998 Julian Smart
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile for isosurf example (UNIX).
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
OPENGL_LIBS=-lGL -lGLU
|
||||
#if you have old Mesa, try this:
|
||||
#OPENGL_LIBS=-lMesaGL -lMesaGLU
|
||||
|
||||
PROGRAM=isosurf
|
||||
|
||||
CXX = $(shell wx-config --cxx)
|
||||
# -------------------------------------------------------------------------
|
||||
# These are configurable options:
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
OBJECTS = $(PROGRAM).o
|
||||
# C++ compiler
|
||||
CXX = g++
|
||||
|
||||
# implementation
|
||||
# Standard flags for C++
|
||||
CXXFLAGS =
|
||||
|
||||
.SUFFIXES: .o .cpp
|
||||
# Standard preprocessor flags (common for CC and CXX)
|
||||
CPPFLAGS =
|
||||
|
||||
.cpp.o :
|
||||
$(CXX) -c `wx-config --cxxflags` -o $@ $<
|
||||
# Standard linker flags
|
||||
LDFLAGS =
|
||||
|
||||
all: $(PROGRAM) isosurf.dat
|
||||
# Location and arguments of wx-config script
|
||||
WX_CONFIG = wx-config
|
||||
|
||||
$(PROGRAM): $(OBJECTS)
|
||||
$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
|
||||
# C++ flags to use with wxWidgets code
|
||||
WX_CXXFLAGS = `$(WX_CONFIG) --cxxflags`
|
||||
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Do not modify the rest of this file!
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
### Variables: ###
|
||||
|
||||
CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
|
||||
ISOSURF_CXXFLAGS = -I. $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
|
||||
ISOSURF_OBJECTS = \
|
||||
isosurf_isosurf.o
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: isosurf
|
||||
|
||||
install: all
|
||||
|
||||
uninstall:
|
||||
|
||||
clean:
|
||||
rm -f *.o $(PROGRAM)
|
||||
rm -f ./*.o
|
||||
rm -f ./*.d
|
||||
rm -f isosurf
|
||||
|
||||
isosurf.dat: isosurf.dat.gz
|
||||
gzip -c -d isosurf.dat.gz > isosurf.dat
|
||||
isosurf: $(ISOSURF_OBJECTS)
|
||||
$(CXX) -o $@ $(ISOSURF_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) --libs gl,core,base`
|
||||
|
||||
isosurf_isosurf.o: ./isosurf.cpp
|
||||
$(CXX) -c -o $@ $(ISOSURF_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
.PHONY: all install uninstall clean
|
||||
|
||||
|
||||
# Dependencies tracking:
|
||||
-include ./*.d
|
||||
|
||||
54
samples/opengl/makefile.unx
Normal file
54
samples/opengl/makefile.unx
Normal file
@@ -0,0 +1,54 @@
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# These are configurable options:
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Do not modify the rest of this file!
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
### Variables: ###
|
||||
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: cube isosurf penguin
|
||||
|
||||
install: all
|
||||
|
||||
uninstall:
|
||||
|
||||
clean:
|
||||
rm -f ./*.o
|
||||
rm -f ./*.d
|
||||
(cd cube && $(MAKE) clean)
|
||||
(cd isosurf && $(MAKE) clean)
|
||||
(cd penguin && $(MAKE) clean)
|
||||
|
||||
cube:
|
||||
(cd cube && $(MAKE) all)
|
||||
|
||||
isosurf:
|
||||
(cd isosurf && $(MAKE) all)
|
||||
|
||||
penguin:
|
||||
(cd penguin && $(MAKE) all)
|
||||
|
||||
.PHONY: all install uninstall clean cube isosurf penguin
|
||||
|
||||
|
||||
# Dependencies tracking:
|
||||
-include ./*.d
|
||||
@@ -41,7 +41,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
|
||||
DESTDIR =
|
||||
WX_RELEASE = 2.7
|
||||
WX_VERSION = $(WX_RELEASE).1
|
||||
WX_VERSION = $(WX_RELEASE).2
|
||||
LIBDIRNAME = $(top_builddir)lib
|
||||
PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
|
||||
|
||||
@@ -1,33 +1,89 @@
|
||||
#
|
||||
# File: makefile.unx
|
||||
# Author: Julian Smart
|
||||
# Created: 1998
|
||||
# Updated:
|
||||
# Copyright: (c) 1998 Julian Smart
|
||||
#
|
||||
# Makefile for penguin example (UNIX).
|
||||
# =========================================================================
|
||||
# This makefile was generated by
|
||||
# Bakefile 0.2.0 (http://bakefile.sourceforge.net)
|
||||
# Do not modify, all changes will be overwritten!
|
||||
# =========================================================================
|
||||
|
||||
OPENGL_LIBS=-lGL -lGLU
|
||||
#if you have old Mesa, try this:
|
||||
#OPENGL_LIBS=-lMesaGL -lMesaGLU
|
||||
|
||||
CC = $(shell wx-config --cc)
|
||||
CXX = $(shell wx-config --cxx)
|
||||
|
||||
Penguin: penguin.o trackball.o lw.o
|
||||
$(CXX) -o Penguin \
|
||||
penguin.o trackball.o lw.o \
|
||||
`wx-config --libs` -lwx_gtk_gl $(OPENGL_LIBS)
|
||||
# -------------------------------------------------------------------------
|
||||
# These are configurable options:
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
penguin.o: penguin.cpp
|
||||
$(CXX) `wx-config --cxxflags` -I../../gtk -c penguin.cpp
|
||||
# C compiler
|
||||
CC = gcc
|
||||
|
||||
lw.o: lw.cpp
|
||||
$(CXX) `wx-config --cxxflags` -I../../gtk -c lw.cpp
|
||||
# C++ compiler
|
||||
CXX = g++
|
||||
|
||||
trackball.o: trackball.c
|
||||
$(CC) `wx-config --cflags` -I../../gtk -c trackball.c
|
||||
# Standard flags for CC
|
||||
CFLAGS =
|
||||
|
||||
# Standard flags for C++
|
||||
CXXFLAGS =
|
||||
|
||||
# Standard preprocessor flags (common for CC and CXX)
|
||||
CPPFLAGS =
|
||||
|
||||
# Standard linker flags
|
||||
LDFLAGS =
|
||||
|
||||
# Location and arguments of wx-config script
|
||||
WX_CONFIG = wx-config
|
||||
|
||||
# C flags to use with wxWidgets code
|
||||
WX_CFLAGS = `$(WX_CONFIG) --cflags`
|
||||
|
||||
# C++ flags to use with wxWidgets code
|
||||
WX_CXXFLAGS = `$(WX_CONFIG) --cxxflags`
|
||||
|
||||
|
||||
|
||||
# -------------------------------------------------------------------------
|
||||
# Do not modify the rest of this file!
|
||||
# -------------------------------------------------------------------------
|
||||
|
||||
### Variables: ###
|
||||
|
||||
CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
|
||||
PENGUIN_CFLAGS = -I. $(WX_CFLAGS) $(CPPFLAGS) $(CFLAGS)
|
||||
PENGUIN_CXXFLAGS = -I. $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
|
||||
PENGUIN_OBJECTS = \
|
||||
penguin_penguin.o \
|
||||
penguin_dxfrenderer.o \
|
||||
penguin_trackball.o
|
||||
|
||||
### Conditionally set variables: ###
|
||||
|
||||
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: penguin
|
||||
|
||||
install: all
|
||||
|
||||
uninstall:
|
||||
|
||||
clean:
|
||||
rm -f *.o Penguin
|
||||
rm -f ./*.o
|
||||
rm -f ./*.d
|
||||
rm -f penguin
|
||||
|
||||
penguin: $(PENGUIN_OBJECTS)
|
||||
$(CXX) -o $@ $(PENGUIN_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) --libs gl,core,base`
|
||||
|
||||
penguin_penguin.o: ./penguin.cpp
|
||||
$(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
penguin_dxfrenderer.o: ./dxfrenderer.cpp
|
||||
$(CXX) -c -o $@ $(PENGUIN_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
penguin_trackball.o: ./trackball.c
|
||||
$(CC) -c -o $@ $(PENGUIN_CFLAGS) $(CPPDEPS) $<
|
||||
|
||||
.PHONY: all install uninstall clean
|
||||
|
||||
|
||||
# Dependencies tracking:
|
||||
-include ./*.d
|
||||
|
||||
Reference in New Issue
Block a user