X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d611b5cf26c2b16ba3a7d91d79d06e759be2b3d..16aa9c84bca0619ff0a89267772ca30d80324951:/contrib/samples/ogl/studio/makefile.gcc?ds=sidebyside

diff --git a/contrib/samples/ogl/studio/makefile.gcc b/contrib/samples/ogl/studio/makefile.gcc
index 4fb52187e8..986ab18a83 100644
--- a/contrib/samples/ogl/studio/makefile.gcc
+++ b/contrib/samples/ogl/studio/makefile.gcc
@@ -12,35 +12,38 @@ include ../../../../build/msw/config.gcc
 
 ### Variables: ###
 
-LIBDIRNAME = \
-	.\..\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+STUDIO_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) -I.\..\..\..\include \
-	$(CXXFLAGS)
-OGLEDIT_OBJECTS =  \
-	$(OBJS)\ogledit_studio.o \
-	$(OBJS)\ogledit_doc.o \
-	$(OBJS)\ogledit_shapes.o \
-	$(OBJS)\ogledit_symbols.o \
-	$(OBJS)\ogledit_view.o \
-	$(OBJS)\ogledit_cspalette.o \
-	$(OBJS)\ogledit_mainfrm.o \
-	$(OBJS)\ogledit_project.o \
-	$(OBJS)\ogledit_dialogs.o \
-	$(OBJS)\ogledit_csprint.o \
-	$(OBJS)\ogledit_studio_rc.o
+	$(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -I. \
+	$(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS)
+STUDIO_OBJECTS =  \
+	$(OBJS)\studio_studio.o \
+	$(OBJS)\studio_doc.o \
+	$(OBJS)\studio_shapes.o \
+	$(OBJS)\studio_symbols.o \
+	$(OBJS)\studio_view.o \
+	$(OBJS)\studio_cspalette.o \
+	$(OBJS)\studio_mainfrm.o \
+	$(OBJS)\studio_project.o \
+	$(OBJS)\studio_dialogs.o \
+	$(OBJS)\studio_csprint.o \
+	$(OBJS)\studio_studio_rc.o
 
 ### Conditionally set variables: ###
 
 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
@@ -123,6 +126,13 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv
+endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 endif
@@ -141,8 +151,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-
 
 all: $(OBJS)
 $(OBJS):
@@ -150,50 +158,50 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\ogledit.exe data
+all: $(OBJS)\studio.exe data
 
-$(OBJS)\ogledit_cspalette.o: .\cspalette.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_cspalette.o: .\cspalette.cpp
+	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-$(OBJS)\ogledit_csprint.o: .\csprint.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_csprint.o: .\csprint.cpp
+	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-$(OBJS)\ogledit_dialogs.o: .\dialogs.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_dialogs.o: .\dialogs.cpp
+	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-$(OBJS)\ogledit_doc.o: .\doc.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_doc.o: .\doc.cpp
+	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-$(OBJS)\ogledit_mainfrm.o: .\mainfrm.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_mainfrm.o: .\mainfrm.cpp
+	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-$(OBJS)\ogledit_project.o: .\project.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_project.o: .\project.cpp
+	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-$(OBJS)\ogledit_shapes.o: .\shapes.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_shapes.o: .\shapes.cpp
+	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-$(OBJS)\ogledit_studio.o: .\studio.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_studio.o: .\studio.cpp
+	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-$(OBJS)\ogledit_studio_rc.o: .\studio.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) --include-dir ./../../../include
+$(OBJS)\studio_studio_rc.o: .\studio.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_symbols.o: .\symbols.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_symbols.o: .\symbols.cpp
+	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
-$(OBJS)\ogledit_view.o: .\view.cpp
-	$(CXX) -c -o $@ $(OGLEDIT_CXXFLAGS) $<
+$(OBJS)\studio_view.o: .\view.cpp
+	$(CXX) -c -o $@ $(STUDIO_CXXFLAGS) $<
 
 clean: 
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe
+	-if exist $(OBJS)\studio.exe del $(OBJS)\studio.exe
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %%f in (studio_resources.wxr) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
-$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS) $(OBJS)\ogledit_studio_rc.o
-	$(CXX) -o $@ $(OGLEDIT_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows   -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl $(__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
+$(OBJS)\studio.exe: $(STUDIO_OBJECTS) $(OBJS)\studio_studio_rc.o
+	$(CXX) -o $@ $(STUDIO_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_ADV_p) $(__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 data