Changeset 685

Timestamp:

Mar 3, 2013, 8:55:03 PM (12 years ago)

Author:

alloc

Message:

Daodan: Version information

Location:

Daodan

Files:

• makefile (modified) (3 diffs)
• src/Daodan_Cheater.c (modified) (2 diffs)
• src/_DLLInfo.rc (added)
• src/_Version.h (added)

Daodan/makefile

@@ -2 +2 @@
 ifeq ("Linux","$(UNAME)")
     GCC := i686-w64-mingw32-gcc
-    DLLTOOL := i686-w64-mingw32-dlltool
+    WINDRES := i686-w64-mingw32-windres
 else
     GCC := gcc
-    DLLTOOL := dlltool
+    WINDRES := windres
 endif
 
 GCCFLAGS = -O0 -Wall -fomit-frame-pointer -fpack-struct
-LINKFLAGS = -O0 -Wall -fomit-frame-pointer -fpack-struct -s -mdll -mthread -Xlinker --major-image-version -Xlinker 1
+LINKFLAGS = -O0 -Wall -fomit-frame-pointer -fpack-struct -s -mdll -mthread
 
 #LIBS = -lwinmm -lopengl32 -lgdi32
@@ -16 +16 @@
 OUT = build/binkw32.dll
 
-SRC = src/Daodan.c src/Daodan_BSL.c src/Daodan_Character.c src/Daodan_Cheater.c src/Daodan_Console.c src/Daodan_DLLStubs.c src/daodan_gl.c src/Daodan_Patch.c src/Daodan_Persistence.c src/Daodan_Utility.c src/Daodan_Win32.c src/Daodan_WindowHack.c src/inifile_reader.c src/Oni_Symbols.c
-DEST = $(patsubst src/%.c,build/%.o,$(SRC))
+SRC = src/Daodan.c src/Daodan_BSL.c src/Daodan_Character.c src/Daodan_Cheater.c src/Daodan_Console.c src/Daodan_DLLStubs.c src/daodan_gl.c src/Daodan_Patch.c src/Daodan_Persistence.c src/Daodan_Utility.c src/Daodan_Win32.c src/Daodan_WindowHack.c src/inifile_reader.c src/Oni_Symbols.c src/_DLLInfo.rc
+DEST = $(patsubst src/%.rc,build/%.o,$(patsubst src/%.c,build/%.o,$(SRC)))
 
 ALL: $(DEST) $(OBJS)
@@ -32 +32 @@
         echo
 
+build/%.o: src/%.rc
+        echo "Assembling resource $<"
+        $(WINDRES) -i $< -o $@
+

Daodan/src/Daodan_Cheater.c

@@ -4 +4 @@
 #include "Oni.h"
 #include "Oni_Character.h"
+
+#include "_Version.h"
 
 #include "Daodan.h"
@@ -47 +49 @@
         { "x",                "Developer Access Enabled",        "Developer Access Disabled",  cheat_x                },
         { "testcheat",        "Testing...",                      "",                           cheat_testcheat        },
-        { "tellmetheversion", "Daodan v.3.0",                    "",                           cheat_tellmetheversion },
+        { "tellmetheversion", "Daodan v."DAODAN_VERSION_STRING"",                    "",                           cheat_tellmetheversion },
         {0}
 };