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:
		| @@ -138,9 +138,15 @@ __THREAD_DEFINE_p = -DwxNO_THREADS | ||||
| !if "$(USE_THREADS)" == "0" | ||||
| __THREAD_DEFINE_p_1 = -dwxNO_THREADS | ||||
| !endif | ||||
| !if "$(UNICODE)" == "0" | ||||
| __UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 | ||||
| !endif | ||||
| !if "$(UNICODE)" == "1" | ||||
| __UNICODE_DEFINE_p = -D_UNICODE | ||||
| !endif | ||||
| !if "$(UNICODE)" == "0" | ||||
| __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0 | ||||
| !endif | ||||
| !if "$(UNICODE)" == "1" | ||||
| __UNICODE_DEFINE_p_1 = -d_UNICODE | ||||
| !endif | ||||
| @@ -224,7 +230,7 @@ clean: | ||||
|  | ||||
| $(OBJS)\svgtest.exe: $(SVGTEST_OBJECTS)  $(OBJS)\svgtest_sample.res | ||||
| 	ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&| | ||||
| 	c0w32.obj $(SVGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\svgtest_sample.res | ||||
| 	c0w32.obj $(SVGTEST_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\svgtest_sample.res | ||||
| | | ||||
|  | ||||
| $(OBJS)\svgtest_sample.res: .\..\..\samples\sample.rc | ||||
|   | ||||
		Reference in New Issue
	
	Block a user