X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19c35fa587f97cf83e2cb28afe76b8db85b36c9f..0e2ff612070d7df3e36d786c213b14a8fd97a83b:/contrib/samples/ogl/ogledit/makefile.gcc

diff --git a/contrib/samples/ogl/ogledit/makefile.gcc b/contrib/samples/ogl/ogledit/makefile.gcc
index b94e353fe1..4aad42a5db 100644
--- a/contrib/samples/ogl/ogledit/makefile.gcc
+++ b/contrib/samples/ogl/ogledit/makefile.gcc
@@ -16,7 +16,7 @@ OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -I. \
+	$(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -Wall -I. \
 	$(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS)
 OGLEDIT_OBJECTS =  \
 	$(OBJS)\ogledit_ogledit.o \
@@ -115,10 +115,10 @@ 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
@@ -150,19 +150,19 @@ $(OBJS):
 
 all: $(OBJS)\ogledit.exe
 
-$(OBJS)\ogledit_doc.o: .\doc.cpp
+$(OBJS)\ogledit_doc.o: ./doc.cpp
 	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
 
-$(OBJS)\ogledit_ogledit.o: .\ogledit.cpp
+$(OBJS)\ogledit_ogledit.o: ./ogledit.cpp
 	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
 
-$(OBJS)\ogledit_ogledit_rc.o: .\ogledit.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 --include-dir ./../../../include
+$(OBJS)\ogledit_ogledit_rc.o: ./ogledit.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 --include-dir ./../../../include
 
-$(OBJS)\ogledit_palette.o: .\palette.cpp
+$(OBJS)\ogledit_palette.o: ./palette.cpp
 	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
 
-$(OBJS)\ogledit_view.o: .\view.cpp
+$(OBJS)\ogledit_view.o: ./view.cpp
 	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
 
 clean: 
@@ -170,6 +170,6 @@ clean:
 	-if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe
 
 $(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_ogledit_rc.o
-	$(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated $(__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
+	$(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl  -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated  $(__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