Fixed the code to actually work.

[wxWidgets.git] / samples / widgets / makefile.gcc

diff --git a/samples/widgets/makefile.gcc b/samples/widgets/makefile.gcc
index 3cfcead74c9bf41a9ed0c05aed8c33f137be3b4e..ee895c66f7400730a565d13e157804b44126acf1 100644 (file)
--- a/samples/widgets/makefile.gcc
+++ b/samples/widgets/makefile.gcc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-include ../../build/config.gcc
+include ../../build/msw/config.gcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -12,17 +12,18 @@ include ../../build/config.gcc
 
 ### Variables: ###
 
-LIBDIRNAME = \
-       .\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 WIDGETS_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(LIBDIRNAME) -I.\..\..\src\tiff \
-       -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex \
-       -I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \
+       $(__EXCEPTIONSFLAG_5)
 WIDGETS_OBJECTS =  \
        $(OBJS)\widgets_button.o \
+       $(OBJS)\widgets_checkbox.o \
        $(OBJS)\widgets_combobox.o \
        $(OBJS)\widgets_gauge.o \
        $(OBJS)\widgets_listbox.o \
@@ -40,6 +41,12 @@ WIDGETS_OBJECTS =  \
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
+ifeq ($(SHARED),0)
+LIBDIRNAME = .\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = .\..\..\lib\gcc_dll$(CFG)
+endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
@@ -101,6 +108,18 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_4 = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_4 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_5 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_5 = 
+endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif
@@ -117,10 +136,13 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG_2 = -O2
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
@@ -149,47 +171,50 @@ $(OBJS):
 
 all: $(OBJS)\widgets.exe
 
-$(OBJS)\widgets_button.o: .\button.cpp
+$(OBJS)\widgets_button.o: ./button.cpp
+       $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
+
+$(OBJS)\widgets_checkbox.o: ./checkbox.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_combobox.o: .\combobox.cpp
+$(OBJS)\widgets_combobox.o: ./combobox.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_gauge.o: .\gauge.cpp
+$(OBJS)\widgets_gauge.o: ./gauge.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_listbox.o: .\listbox.cpp
+$(OBJS)\widgets_listbox.o: ./listbox.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_notebook.o: .\notebook.cpp
+$(OBJS)\widgets_notebook.o: ./notebook.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_radiobox.o: .\radiobox.cpp
+$(OBJS)\widgets_radiobox.o: ./radiobox.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_slider.o: .\slider.cpp
+$(OBJS)\widgets_slider.o: ./slider.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_spinbtn.o: .\spinbtn.cpp
+$(OBJS)\widgets_spinbtn.o: ./spinbtn.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_static.o: .\static.cpp
+$(OBJS)\widgets_static.o: ./static.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_textctrl.o: .\textctrl.cpp
+$(OBJS)\widgets_textctrl.o: ./textctrl.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_widgets.o: .\widgets.cpp
+$(OBJS)\widgets_widgets.o: ./widgets.cpp
        $(CXX) -c -o $@ $(WIDGETS_CXXFLAGS) $<
 
-$(OBJS)\widgets_widgets_rc.o: .\widgets.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 $(LIBDIRNAME) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib  --include-dir ./../../src/regex --include-dir ./../../src/expat/lib --include-dir . $(__DLLFLAG_p_1)
+$(OBJS)\widgets_widgets_rc.o: ./widgets.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
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe
 
 $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS) $(OBJS)\widgets_widgets_rc.o
-       $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
+       $(CXX) -o $@ $(WIDGETS_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__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