From a49529e1c3dbcdf8f3f57b3ffaed7ada604fba61 Mon Sep 17 00:00:00 2001 From: Sylae Jiendra Corell Date: Tue, 17 Jun 2014 16:03:20 -0600 Subject: [PATCH] Makefiles for CharEd, ScenEd --- .../{Makefile-Nightly-i586 => Makefile} | 11 ++-- Win32/charedit/Makefile-Nightly-amd64 | 57 ---------------- .../{Makefile-DevCpp.win => Makefile} | 11 ++-- Win32/scenedit/Makefile-Nightly-amd64 | 66 ------------------- Win32/scenedit/Makefile-Nightly-i586 | 66 ------------------- 5 files changed, 10 insertions(+), 201 deletions(-) rename Win32/charedit/{Makefile-Nightly-i586 => Makefile} (85%) delete mode 100644 Win32/charedit/Makefile-Nightly-amd64 rename Win32/scenedit/{Makefile-DevCpp.win => Makefile} (87%) delete mode 100644 Win32/scenedit/Makefile-Nightly-amd64 delete mode 100644 Win32/scenedit/Makefile-Nightly-i586 diff --git a/Win32/charedit/Makefile-Nightly-i586 b/Win32/charedit/Makefile similarity index 85% rename from Win32/charedit/Makefile-Nightly-i586 rename to Win32/charedit/Makefile index d2343d4b..4a3fb9d2 100644 --- a/Win32/charedit/Makefile-Nightly-i586 +++ b/Win32/charedit/Makefile @@ -1,13 +1,12 @@ -# Project: Blades of Exile Character Editor -# Makefile created by Dev-C++ 4.9.9.2 +include ../.config.vars -CPP = i586-mingw32msvc-g++ -CC = i586-mingw32msvc-gcc -WINDRES = i586-mingw32msvc-windres +CPP = $(PREFIX)g++ +CC = $(PREFIX)gcc +WINDRES = $(PREFIX)windres RES = Blades_of_Exile_Character_Editor_private.res OBJ = graphutl.o bladpced.o dlogtool.o edaction.o edfileio.o editors.o edsound.o global.o graphics.o $(RES) LINKOBJ = graphutl.o bladpced.o dlogtool.o edaction.o edfileio.o editors.o edsound.o global.o graphics.o $(RES) -LIBS = -lwinmm -mwindows -lwinmm +LIBS = -lwinmm -mwindows -lwinmm -static-libgcc -static-libstdc++ INCS = -I"include" CXXINCS = BIN = "Blades of Exile Character Editor.exe" diff --git a/Win32/charedit/Makefile-Nightly-amd64 b/Win32/charedit/Makefile-Nightly-amd64 deleted file mode 100644 index 17724e16..00000000 --- a/Win32/charedit/Makefile-Nightly-amd64 +++ /dev/null @@ -1,57 +0,0 @@ -# Project: Blades of Exile Character Editor -# Makefile created by Dev-C++ 4.9.9.2 - -CPP = amd64-mingw32msvc-g++ -CC = amd64-mingw32msvc-gcc -WINDRES = amd64-mingw32msvc-windres -RES = Blades_of_Exile_Character_Editor_private.res -OBJ = graphutl.o bladpced.o dlogtool.o edaction.o edfileio.o editors.o edsound.o global.o graphics.o $(RES) -LINKOBJ = graphutl.o bladpced.o dlogtool.o edaction.o edfileio.o editors.o edsound.o global.o graphics.o $(RES) -LIBS = -lwinmm -mwindows -lwinmm -INCS = -I"include" -CXXINCS = -BIN = "Blades of Exile Character Editor.exe" -CXXFLAGS = $(CXXINCS) -Wall -O2 -CFLAGS = $(INCS) -O2 -RM = rm -f - -.PHONY: all all-before all-after clean clean-custom - -all: all-before "Blades of Exile Character Editor.exe" all-after - - -clean: clean-custom - ${RM} $(OBJ) $(BIN) - -$(BIN): $(OBJ) - $(CPP) $(LINKOBJ) -o "Blades of Exile Character Editor.exe" $(LIBS) - -graphutl.o: graphutl.cpp - $(CPP) -c graphutl.cpp -o graphutl.o $(CXXFLAGS) - -bladpced.o: bladpced.cpp - $(CPP) -c bladpced.cpp -o bladpced.o $(CXXFLAGS) - -dlogtool.o: dlogtool.cpp - $(CPP) -c dlogtool.cpp -o dlogtool.o $(CXXFLAGS) - -edaction.o: edaction.cpp - $(CPP) -c edaction.cpp -o edaction.o $(CXXFLAGS) - -edfileio.o: edfileio.cpp - $(CPP) -c edfileio.cpp -o edfileio.o $(CXXFLAGS) - -editors.o: editors.cpp - $(CPP) -c editors.cpp -o editors.o $(CXXFLAGS) - -edsound.o: edsound.cpp - $(CPP) -c edsound.cpp -o edsound.o $(CXXFLAGS) - -global.o: global.cpp - $(CPP) -c global.cpp -o global.o $(CXXFLAGS) - -graphics.o: graphics.cpp - $(CPP) -c graphics.cpp -o graphics.o $(CXXFLAGS) - -Blades_of_Exile_Character_Editor_private.res: Blades_of_Exile_Character_Editor_private.rc BLADPCED.RC - $(WINDRES) -i Blades_of_Exile_Character_Editor_private.rc --input-format=rc -o Blades_of_Exile_Character_Editor_private.res -O coff diff --git a/Win32/scenedit/Makefile-DevCpp.win b/Win32/scenedit/Makefile similarity index 87% rename from Win32/scenedit/Makefile-DevCpp.win rename to Win32/scenedit/Makefile index ecdf718b..def55b2b 100644 --- a/Win32/scenedit/Makefile-DevCpp.win +++ b/Win32/scenedit/Makefile @@ -1,13 +1,12 @@ -# Project: Blades of Exile Scenario Editor -# Makefile created by Dev-C++ 4.9.9.2 +include ../.config.vars -CPP = g++.exe -CC = gcc.exe -WINDRES = windres.exe +CPP = $(PREFIX)g++.exe +CC = $(PREFIX)gcc.exe +WINDRES = $(PREFIX)windres.exe RES = Blades_of_Exile_Scenario_Editor_private.res OBJ = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES) LINKOBJ = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES) -LIBS = -L"C:/Dev-Cpp/lib/GTK+" -mwindows -lwinmm --strip-all +LIBS = -mwindows -lwinmm --strip-all -static-libgcc -static-libstdc++ INCS = -I"include" CXXINCS = BIN = "Blades of Exile Scenario Editor.exe" diff --git a/Win32/scenedit/Makefile-Nightly-amd64 b/Win32/scenedit/Makefile-Nightly-amd64 deleted file mode 100644 index d016ff1d..00000000 --- a/Win32/scenedit/Makefile-Nightly-amd64 +++ /dev/null @@ -1,66 +0,0 @@ -# Project: Blades of Exile Scenario Editor -# Makefile created by Dev-C++ 4.9.9.2 - -CPP = amd64-mingw32msvc-g++ -CC = amd64-mingw32msvc-gcc -WINDRES = amd64-mingw32msvc-windres -RES = Blades_of_Exile_Scenario_Editor_private.res -OBJ = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES) -LINKOBJ = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES) -LIBS = -mwindows -lwinmm --strip-all -INCS = -I"include" -CXXINCS = -BIN = "Blades of Exile Scenario Editor.exe" -CXXFLAGS = $(CXXINCS) -fno-exceptions -fno-rtti -CFLAGS = $(INCS) -RM = rm -f - -.PHONY: all all-before all-after clean clean-custom - -all: all-before "Blades of Exile Scenario Editor.exe" all-after - - -clean: clean-custom - ${RM} $(OBJ) $(BIN) - -$(BIN): $(OBJ) - $(CPP) $(LINKOBJ) -o "Blades of Exile Scenario Editor.exe" $(LIBS) - -buttonmg.o: buttonmg.cpp - $(CPP) -c buttonmg.cpp -o buttonmg.o $(CXXFLAGS) - -dlogtool.o: dlogtool.cpp - $(CPP) -c dlogtool.cpp -o dlogtool.o $(CXXFLAGS) - -global.o: global.cpp - $(CPP) -c global.cpp -o global.o $(CXXFLAGS) - -graphutl.o: graphutl.cpp - $(CPP) -c graphutl.cpp -o graphutl.o $(CXXFLAGS) - -keydlgs.o: keydlgs.cpp - $(CPP) -c keydlgs.cpp -o keydlgs.o $(CXXFLAGS) - -tfileio.o: tfileio.cpp - $(CPP) -c tfileio.cpp -o tfileio.o $(CXXFLAGS) - -townout.o: townout.cpp - $(CPP) -c townout.cpp -o townout.o $(CXXFLAGS) - -edsound.o: edsound.cpp - $(CPP) -c edsound.cpp -o edsound.o $(CXXFLAGS) - -graphics.o: graphics.cpp - $(CPP) -c graphics.cpp -o graphics.o $(CXXFLAGS) - -scenario.o: scenario.cpp - $(CPP) -c scenario.cpp -o scenario.o $(CXXFLAGS) - -blscened.o: blscened.cpp - $(CPP) -c blscened.cpp -o blscened.o $(CXXFLAGS) - -tactions.o: tactions.cpp - $(CPP) -c tactions.cpp -o tactions.o $(CXXFLAGS) - -Blades_of_Exile_Scenario_Editor_private.res: Blades_of_Exile_Scenario_Editor_private.rc STRINGS.RC BLSCENED.RC GAMEDLOG.RC - $(WINDRES) -i Blades_of_Exile_Scenario_Editor_private.rc --input-format=rc -o Blades_of_Exile_Scenario_Editor_private.res -O coff -D_INCLUDED_RC diff --git a/Win32/scenedit/Makefile-Nightly-i586 b/Win32/scenedit/Makefile-Nightly-i586 deleted file mode 100644 index 2a575538..00000000 --- a/Win32/scenedit/Makefile-Nightly-i586 +++ /dev/null @@ -1,66 +0,0 @@ -# Project: Blades of Exile Scenario Editor -# Makefile created by Dev-C++ 4.9.9.2 - -CPP = i586-mingw32msvc-g++ -CC = i586-mingw32msvc-gcc -WINDRES = i586-mingw32msvc-windres -RES = Blades_of_Exile_Scenario_Editor_private.res -OBJ = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES) -LINKOBJ = buttonmg.o dlogtool.o global.o graphutl.o keydlgs.o tfileio.o townout.o edsound.o graphics.o scenario.o blscened.o tactions.o $(RES) -LIBS = -mwindows -lwinmm --strip-all -INCS = -I"include" -CXXINCS = -BIN = "Blades of Exile Scenario Editor.exe" -CXXFLAGS = $(CXXINCS) -fno-exceptions -fno-rtti -CFLAGS = $(INCS) -RM = rm -f - -.PHONY: all all-before all-after clean clean-custom - -all: all-before "Blades of Exile Scenario Editor.exe" all-after - - -clean: clean-custom - ${RM} $(OBJ) $(BIN) - -$(BIN): $(OBJ) - $(CPP) $(LINKOBJ) -o "Blades of Exile Scenario Editor.exe" $(LIBS) - -buttonmg.o: buttonmg.cpp - $(CPP) -c buttonmg.cpp -o buttonmg.o $(CXXFLAGS) - -dlogtool.o: dlogtool.cpp - $(CPP) -c dlogtool.cpp -o dlogtool.o $(CXXFLAGS) - -global.o: global.cpp - $(CPP) -c global.cpp -o global.o $(CXXFLAGS) - -graphutl.o: graphutl.cpp - $(CPP) -c graphutl.cpp -o graphutl.o $(CXXFLAGS) - -keydlgs.o: keydlgs.cpp - $(CPP) -c keydlgs.cpp -o keydlgs.o $(CXXFLAGS) - -tfileio.o: tfileio.cpp - $(CPP) -c tfileio.cpp -o tfileio.o $(CXXFLAGS) - -townout.o: townout.cpp - $(CPP) -c townout.cpp -o townout.o $(CXXFLAGS) - -edsound.o: edsound.cpp - $(CPP) -c edsound.cpp -o edsound.o $(CXXFLAGS) - -graphics.o: graphics.cpp - $(CPP) -c graphics.cpp -o graphics.o $(CXXFLAGS) - -scenario.o: scenario.cpp - $(CPP) -c scenario.cpp -o scenario.o $(CXXFLAGS) - -blscened.o: blscened.cpp - $(CPP) -c blscened.cpp -o blscened.o $(CXXFLAGS) - -tactions.o: tactions.cpp - $(CPP) -c tactions.cpp -o tactions.o $(CXXFLAGS) - -Blades_of_Exile_Scenario_Editor_private.res: Blades_of_Exile_Scenario_Editor_private.rc STRINGS.RC BLSCENED.RC GAMEDLOG.RC - $(WINDRES) -i Blades_of_Exile_Scenario_Editor_private.rc --input-format=rc -o Blades_of_Exile_Scenario_Editor_private.res -O coff -D_INCLUDED_RC