diff options
| author | pixel <pixel> | 2004-12-22 15:25:00 +0000 |
|---|---|---|
| committer | pixel <pixel> | 2004-12-22 15:25:00 +0000 |
| commit | 766388b4a337de6fc387755f5eb23c2b29a45830 (patch) | |
| tree | f2e355ecdfb1b007ef09b79df232feac7f457646 | |
| parent | 1deecb6a389e0ec6d006d8ebeab659c9f194b709 (diff) | |
Fixing linux compilation
| -rw-r--r-- | compile/win32/Makefile | 17 | ||||
| -rw-r--r-- | luapatch.rc | 16 |
2 files changed, 16 insertions, 17 deletions
diff --git a/compile/win32/Makefile b/compile/win32/Makefile index 7071224..f64d651 100644 --- a/compile/win32/Makefile +++ b/compile/win32/Makefile @@ -16,7 +16,7 @@ CPPFLAGS = $(INCLUDES) -O4 -march=i686 -DSTDC_HEADERS -DREADLINE_STATIC -fexcept LDFLAGS = -march=i586 -O4 SOURCES = \ -../../Dalos/Dalos.cc ../../cd-tool.cpp +../../Dalos/Dalos.cc ../../cd-tool.cpp ../../luapatch.cpp MOGLTK_SOURCES = \ ../../mogltk/lib/base.cc ../../mogltk/lib/glwidgets.cc \ @@ -98,9 +98,13 @@ DALOS_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES) $(MOGLTK_S CD_TOOL_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES)))) cd-tool.o -CD_TOOL_DEP = $(addsuffix .dep, $(notdir $(basename $(COMMON_SOURCES)))) cd-tool.o +CD_TOOL_DEP = $(addsuffix .dep, $(notdir $(basename $(COMMON_SOURCES)))) cd-tool.dep -all: dep cd-tool.exe Dalos.exe +LUAPATCH_OBJECTS = $(addsuffix .o, $(notdir $(basename $(COMMON_SOURCES)))) luapatch.o + +LUAPATCH_DEP = $(addsuffix .dep, $(notdir $(basename $(COMMON_SOURCES)))) luapatch.dep + +all: dep cd-tool.exe Dalos.exe luapatch.exe stats: @wc $(WHOLE_SOURCES) @@ -108,6 +112,7 @@ stats: dist: all README-SDL.txt SDL.dll ../../cd-tool.lua ../../COPYING ../../FAQ-cd.txt zip -j9 ../cd-tool-`date +%Y%m%d`-win32.zip cd-tool.exe ../../cd-tool.lua ../../FAQ-cd.txt ../../COPYING zip -j9 ../Dalos-`date +%Y%m%d`-win32.zip Dalos.exe ../../COPYING README-SDL.txt SDL.dll + zip -j9 ../luapatch-`date +%Y%m%d`.zip luapatch.exe ../../FAQ-cd.txt ../../COPYING Dalos.exe: $(DALOS_OBJECTS) $(LD) $(LDFLAGS) -o Dalos.exe $(DALOS_OBJECTS) -lmingw32 -L/usr/local/cross-tools/i386-mingw32msvc/lib -lmingw32 -lSDLmain -lSDL -mwindows -lopengl32 -lglu32 ../../libreadline-static.a @@ -120,6 +125,12 @@ cd-tool.exe: $(CD_TOOL_OBJECTS) $(STRIP) cd-tool.exe upx-nrv -9 cd-tool.exe +luapatch.exe: $(LUAPATCH_OBJECTS) + i586-mingw32msvc-windres -I ../../ ../../luapatch.rc luapatch-res.o + $(LD) $(LDFLAGS) -o luapatch.exe $(LUAPATCH_OBJECTS) luapatch-res.o -mwindows + $(STRIP) luapatch.exe + upx-nrv -9 luapatch.exe + clean: rm -f *.exe *.o *.dep diff --git a/luapatch.rc b/luapatch.rc index 2602292..caf7682 100644 --- a/luapatch.rc +++ b/luapatch.rc @@ -132,17 +132,7 @@ BEGIN BEGIN
VALUE "Comments", "LuaPatcher - CD Patching system"
VALUE "CompanyName", "NOBIS - http://www.nobis-crew.org/"
- VALUE "FileDescription", "LuaPatcher - Système de patch de CD"
- VALUE "FileVersion", "0, 4, 0, 0"
- VALUE "LegalCopyright", "Copyright © 2003-2005 Nicolas ""Pixel"" Noble / NOBIS"
- VALUE "ProductName", "LuaPatch"
- VALUE "ProductVersion", "0, 4, 0, 0"
- END
- BLOCK "040c04b0"
- BEGIN
- VALUE "Comments", "LuaPatcher - Système de patch de CD"
- VALUE "CompanyName", "NOBIS - http://www.nobis-crew.org/"
- VALUE "FileDescription", "NOBIS - http://www.nobis-crew.org/"
+ VALUE "FileDescription", "LuaPatcher - CD Patching system"
VALUE "FileVersion", "0, 4, 0, 0"
VALUE "LegalCopyright", "Copyright © 2003-2005 Nicolas ""Pixel"" Noble / NOBIS"
VALUE "ProductName", "LuaPatch"
@@ -245,9 +235,7 @@ IDI_ICON ICON "cdrom.ico" IDD_FILESELECT DLGINIT
BEGIN
- IDC_SOURCETYPE, 0x403, 6, 0
-0x7771, 0x2065, 0x002e,
- 0
+ IDC_SOURCETYPE, 0x403, 6, 0, 0x7771, 0x2065, 0x002e, 0
END
#endif // Neutral (Sys. Default) resources
|