Regen Bakefiles for OSX HID integration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -12,6 +12,7 @@ include ../../build/msw/config.gcc
 | 
			
		||||
 | 
			
		||||
### Variables: ###
 | 
			
		||||
 | 
			
		||||
WX_RELEASE_NODOT = 25
 | 
			
		||||
OBJS = \
 | 
			
		||||
	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 | 
			
		||||
SETUPHDIR = \
 | 
			
		||||
@@ -19,7 +20,7 @@ SETUPHDIR = \
 | 
			
		||||
NOTEBOOK_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
 | 
			
		||||
	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 | 
			
		||||
	$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \
 | 
			
		||||
	$(__DLLFLAG_p) -I.\..\..\samples $(__EXCEPTIONSFLAG_4) \
 | 
			
		||||
	$(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__EXCEPTIONSFLAG_4) \
 | 
			
		||||
	$(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
 | 
			
		||||
NOTEBOOK_OBJECTS =  \
 | 
			
		||||
	$(OBJS)\notebook_notebook.o \
 | 
			
		||||
@@ -107,23 +108,24 @@ __DLLFLAG_p_1 = --define WXUSINGDLL
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(MONOLITHIC),0)
 | 
			
		||||
__WXLIB_CORE_p = \
 | 
			
		||||
	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
 | 
			
		||||
	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(MONOLITHIC),0)
 | 
			
		||||
__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 | 
			
		||||
__WXLIB_BASE_p = \
 | 
			
		||||
	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(MONOLITHIC),1)
 | 
			
		||||
__WXLIB_MONO_p = \
 | 
			
		||||
	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 | 
			
		||||
	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(USE_GUI),1)
 | 
			
		||||
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 | 
			
		||||
__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(USE_GUI),1)
 | 
			
		||||
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 | 
			
		||||
__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(USE_GUI),1)
 | 
			
		||||
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
 | 
			
		||||
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)
 | 
			
		||||
endif
 | 
			
		||||
ifeq ($(MSLU),1)
 | 
			
		||||
__UNICOWS_LIB_p = -lunicows
 | 
			
		||||
@@ -165,12 +167,12 @@ clean:
 | 
			
		||||
	-if exist $(OBJS)\notebook.exe del $(OBJS)\notebook.exe
 | 
			
		||||
 | 
			
		||||
$(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS) $(OBJS)\notebook_notebook_rc.o
 | 
			
		||||
	$(CXX) -o $@ $(NOTEBOOK_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$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 | 
			
		||||
	$(CXX) -o $@ $(NOTEBOOK_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)$(WX_RELEASE_NODOT)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT) -lwxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 | 
			
		||||
 | 
			
		||||
$(OBJS)\notebook_notebook.o: ./notebook.cpp
 | 
			
		||||
	$(CXX) -c -o $@ $(NOTEBOOK_CXXFLAGS) $<
 | 
			
		||||
 | 
			
		||||
$(OBJS)\notebook_notebook_rc.o: ./notebook.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
 | 
			
		||||
	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 --define NOPCH
 | 
			
		||||
 | 
			
		||||
.PHONY: all clean
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user