Don't use GetThreadId() in wxMSW code.

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

diff --git a/samples/webview/makefile.unx b/samples/webview/makefile.unx
index 551b03071fcbe9adcc036bbf2ee08bbe68eb29e5..d9cd9dab06ded9627f2bd4cabb4150bce8bcb90a 100644 (file)
--- a/samples/webview/makefile.unx
+++ b/samples/webview/makefile.unx
@@ -25,7 +25,7 @@ LDFLAGS ?=
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 
 # Location and arguments of wx-config script 
 WX_CONFIG ?= wx-config
 

-# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+# 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_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
 
 # Use DLL build of wx library to use? [0,1]


@@ -50,10 +50,10 @@ 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)
 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)

-WEB_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
+WEBVIEW_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \

        $(CXXFLAGS)
        $(CXXFLAGS)

-WEB_OBJECTS =  \
-       web_web.o
+WEBVIEW_OBJECTS =  \
+       webview_webview.o

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -73,7 +73,7 @@ endif
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: test_for_selected_wxbuild web
+all: test_for_selected_wxbuild webview

 
 install: 
 
 
 install: 
 


@@ -82,16 +82,16 @@ uninstall:
 clean: 
        rm -f ./*.o
        rm -f ./*.d
 clean: 
        rm -f ./*.o
        rm -f ./*.d

-       rm -f web
+       rm -f webview

 
 test_for_selected_wxbuild: 
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 
 
 test_for_selected_wxbuild: 
        @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
 

-web: $(WEB_OBJECTS)
-       $(CXX) -o $@ $(WEB_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs web,stc,adv,core,base`
+webview: $(WEBVIEW_OBJECTS)
+       $(CXX) -o $@ $(WEBVIEW_OBJECTS)   $(LDFLAGS)  `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs webview,stc,adv,core,base`

 
 

-web_web.o: ./web.cpp
-       $(CXX) -c -o $@ $(WEB_CXXFLAGS) $(CPPDEPS) $<
+webview_webview.o: ./webview.cpp
+       $(CXX) -c -o $@ $(WEBVIEW_CXXFLAGS) $(CPPDEPS) $<

 
 .PHONY: all install uninstall clean
 
 
 .PHONY: all install uninstall clean