rebaked everything, fixes problems with OpenGL samples makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -1,6 +1,6 @@ | ||||
| # ========================================================================= | ||||
| #     This makefile was generated by | ||||
| #     Bakefile 0.2.1 (http://bakefile.sourceforge.net) | ||||
| #     Bakefile 0.2.2 (http://bakefile.sourceforge.net) | ||||
| #     Do not modify, all changes will be overwritten! | ||||
| # ========================================================================= | ||||
|  | ||||
| @@ -14,9 +14,10 @@ include ../../../build/msw/config.gcc | ||||
|  | ||||
| CPPDEPS = -MT$@ -MF$@.d -MD | ||||
| WX_RELEASE_NODOT = 29 | ||||
| COMPILER_PREFIX = gcc | ||||
| OBJS = \ | ||||
| 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| LIBDIRNAME = .\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG) | ||||
| 	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) | ||||
| LIBDIRNAME = .\..\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG) | ||||
| SETUPHDIR = \ | ||||
| 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) | ||||
| WXEMULATOR_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \ | ||||
| @@ -128,9 +129,15 @@ endif | ||||
| ifeq ($(USE_THREADS),0) | ||||
| __THREAD_DEFINE_p_1 = --define wxNO_THREADS | ||||
| endif | ||||
| ifeq ($(UNICODE),0) | ||||
| __UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 | ||||
| endif | ||||
| ifeq ($(UNICODE),1) | ||||
| __UNICODE_DEFINE_p = -D_UNICODE | ||||
| endif | ||||
| ifeq ($(UNICODE),0) | ||||
| __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0 | ||||
| endif | ||||
| ifeq ($(UNICODE),1) | ||||
| __UNICODE_DEFINE_p_1 = --define _UNICODE | ||||
| endif | ||||
| @@ -217,14 +224,14 @@ clean: | ||||
| 	-if exist $(OBJS)\wxemulator.exe del $(OBJS)\wxemulator.exe | ||||
|  | ||||
| $(OBJS)\wxemulator.exe: $(WXEMULATOR_OBJECTS) $(OBJS)\wxemulator_sample_rc.o | ||||
| 	$(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -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) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32 | ||||
| 	$(CXX) -o $@ $(WXEMULATOR_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -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) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 | ||||
|  | ||||
| data:  | ||||
| 	if not exist $(OBJS) mkdir $(OBJS) | ||||
| 	for %%f in (default.wxe ipaq.wxe bluegradient.jpg ipaq01.jpg) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) | ||||
|  | ||||
| $(OBJS)\wxemulator_sample_rc.o: ./../../../samples/sample.rc | ||||
| 	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples | ||||
| 	windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../samples --define NOPCH | ||||
|  | ||||
| $(OBJS)\wxemulator_emulator.o: ./emulator.cpp | ||||
| 	$(CXX) -c -o $@ $(WXEMULATOR_CXXFLAGS) $(CPPDEPS) $< | ||||
|   | ||||
		Reference in New Issue
	
	Block a user