Line endings fixes in bakefile-generated files.

[wxWidgets.git] / samples / render / makefile.unx

diff --git a/samples/render/makefile.unx b/samples/render/makefile.unx
index 6dafa712117e6fe511024ff1786f3258823cf5c6..c4c5c6447a27edd2676f76c5e56b1c875abef7de 100644 (file)
--- a/samples/render/makefile.unx
+++ b/samples/render/makefile.unx
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.9 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -10,26 +10,38 @@
 # These are configurable options:
 # -------------------------------------------------------------------------
 
+# Compiler flags to link loadable module 
+LINK_MODULE_FLAGS ?= -shared
+
 # C++ compiler 
-CXX = g++
+CXX = `$(WX_CONFIG) --cxx`
 
 # Standard flags for C++ 
-CXXFLAGS = 
+CXXFLAGS ?= 
 
 # Standard preprocessor flags (common for CC and CXX) 
-CPPFLAGS = 
+CPPFLAGS ?= 
 
 # Standard linker flags 
-LDFLAGS = 
+LDFLAGS ?= 
 
 # Location and arguments of wx-config script 
-WX_CONFIG = wx-config
+WX_CONFIG ?= wx-config
+
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,osx_cocoa,osx_carbon,dfb]
+WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
+
+# Use DLL build of wx library to use? [0,1]
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi)
 
-# C++ flags to use with wxWidgets code 
-WX_CXXFLAGS = `$(WX_CONFIG) --cxxflags`
+# Compile Unicode build of wxWidgets? [0,1]
+WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/')
+
+# Version of the wx library to build against. 
+WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')
 
 # Build shared lib plugin 
-SHARED = 0
+SHARED ?= 0
 
 
 
@@ -39,16 +51,34 @@ SHARED = 0
 
 ### Variables: ###
 
-CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD
-RENDER_CXXFLAGS =  -I.  $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
+WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
+WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
+WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \
+       --toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
+RENDER_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
+       $(CXXFLAGS)
 RENDER_OBJECTS =  \
        render_render.o
-RENDDLL_CXXFLAGS =  -I.  -fPIC -DPIC $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+RENDDLL_CXXFLAGS = -I. -fPIC -DPIC `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` \
+       $(CPPFLAGS) $(CXXFLAGS)
 RENDDLL_OBJECTS =  \
        renddll_renddll.o
 
 ### Conditionally set variables: ###
 
+ifeq ($(WX_UNICODE),0)
+WX_CONFIG_UNICODE_FLAG = --unicode=no
+endif
+ifeq ($(WX_UNICODE),1)
+WX_CONFIG_UNICODE_FLAG = --unicode=yes
+endif
+ifeq ($(WX_SHARED),0)
+WX_CONFIG_SHARED_FLAG = --static=yes
+endif
+ifeq ($(WX_SHARED),1)
+WX_CONFIG_SHARED_FLAG = --static=no
+endif
 ifeq ($(SHARED),1)
 __renddll___depname = renddll.so
 endif
@@ -56,9 +86,9 @@ endif
 
 ### Targets: ###
 
-all: render $(__renddll___depname)
+all: test_for_selected_wxbuild render $(__renddll___depname)
 
-install: all
+install: 
 
 uninstall: 
 
@@ -68,12 +98,15 @@ clean:
        rm -f render
        rm -f renddll.so
 
+test_for_selected_wxbuild: 
+       @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
+
 render: $(RENDER_OBJECTS)
-       $(CXX) -o $@ $(RENDER_OBJECTS) $(LDFLAGS)   `$(WX_CONFIG) --libs core,base`
+       $(CXX) -o $@ $(RENDER_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base`
 
 ifeq ($(SHARED),1)
 renddll.so: $(RENDDLL_OBJECTS)
-       $(CXX) -shared -fPIC -o $@ $(RENDDLL_OBJECTS) $(LDFLAGS)  `$(WX_CONFIG) --libs core,base`
+       $(CXX) $(LINK_MODULE_FLAGS) -fPIC -o $@ $(RENDDLL_OBJECTS)  $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base`
 endif
 
 render_render.o: ./render.cpp