diff options
| author | Benoit Germain <benoit.germain@ubisoft.com> | 2024-03-19 15:13:45 +0100 |
|---|---|---|
| committer | Benoit Germain <benoit.germain@ubisoft.com> | 2024-03-19 15:57:52 +0100 |
| commit | 930bfb287de0a38746493463016d0e4cea153ac0 (patch) | |
| tree | 2424f961d525e6b33cf4dda7c42cc2301e740a5f | |
| parent | 37e9658f74f9421aaae5fe71f12eb2221f2d574a (diff) | |
| download | lanes-930bfb287de0a38746493463016d0e4cea153ac0.tar.gz lanes-930bfb287de0a38746493463016d0e4cea153ac0.tar.bz2 lanes-930bfb287de0a38746493463016d0e4cea153ac0.zip | |
C++ migration: changed file extensions from .c to .cpp
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | lanes-3.16.3-0.rockspec | 20 | ||||
| -rw-r--r-- | make-vc.cmd | 4 | ||||
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/cancel.cpp (renamed from src/cancel.c) | 0 | ||||
| -rw-r--r-- | src/compat.cpp (renamed from src/compat.c) | 0 | ||||
| -rw-r--r-- | src/deep.cpp (renamed from src/deep.c) | 0 | ||||
| -rw-r--r-- | src/keeper.cpp (renamed from src/keeper.c) | 0 | ||||
| -rw-r--r-- | src/lanes.cpp (renamed from src/lanes.c) | 0 | ||||
| -rw-r--r-- | src/linda.cpp (renamed from src/linda.c) | 0 | ||||
| -rw-r--r-- | src/state.cpp (renamed from src/state.c) | 0 | ||||
| -rw-r--r-- | src/threading.cpp (renamed from src/threading.c) | 0 | ||||
| -rw-r--r-- | src/tools.cpp (renamed from src/tools.c) | 0 | ||||
| -rw-r--r-- | src/universe.cpp (renamed from src/universe.c) | 0 |
14 files changed, 14 insertions, 14 deletions
| @@ -42,7 +42,7 @@ _PREFIX=LUA_CPATH="./src/?.$(_SO)" LUA_PATH="./src/?.lua;./tests/?.lua" | |||
| 42 | #--- | 42 | #--- |
| 43 | all: $(_TARGET_SO) | 43 | all: $(_TARGET_SO) |
| 44 | 44 | ||
| 45 | $(_TARGET_SO): src/*.lua src/*.c src/*.h | 45 | $(_TARGET_SO): src/*.lua src/*.cpp src/*.h |
| 46 | cd src && $(MAKE) LUA=$(LUA) | 46 | cd src && $(MAKE) LUA=$(LUA) |
| 47 | 47 | ||
| 48 | clean: | 48 | clean: |
diff --git a/lanes-3.16.3-0.rockspec b/lanes-3.16.3-0.rockspec index e223a19..106a2d9 100644 --- a/lanes-3.16.3-0.rockspec +++ b/lanes-3.16.3-0.rockspec | |||
| @@ -60,16 +60,16 @@ build = { | |||
| 60 | { | 60 | { |
| 61 | sources = | 61 | sources = |
| 62 | { | 62 | { |
| 63 | "src/cancel.c", | 63 | "src/cancel.cpp", |
| 64 | "src/compat.c", | 64 | "src/compat.cpp", |
| 65 | "src/deep.c", | 65 | "src/deep.cpp", |
| 66 | "src/keeper.c", | 66 | "src/keeper.cpp", |
| 67 | "src/lanes.c", | 67 | "src/lanes.cpp", |
| 68 | "src/linda.c", | 68 | "src/linda.cpp", |
| 69 | "src/tools.c", | 69 | "src/tools.cpp", |
| 70 | "src/state.c", | 70 | "src/state.cpp", |
| 71 | "src/threading.c", | 71 | "src/threading.cpp", |
| 72 | "src/universe.c" | 72 | "src/universe.cpp" |
| 73 | }, | 73 | }, |
| 74 | incdirs = { "src"}, | 74 | incdirs = { "src"}, |
| 75 | }, | 75 | }, |
diff --git a/make-vc.cmd b/make-vc.cmd index 6b63b21..f4cd412 100644 --- a/make-vc.cmd +++ b/make-vc.cmd | |||
| @@ -130,8 +130,8 @@ goto ERR_NOLUA | |||
| 130 | @REM | 130 | @REM |
| 131 | @set FLAGS=/O2 /LD | 131 | @set FLAGS=/O2 /LD |
| 132 | 132 | ||
| 133 | cl %WARN% %FLAGS% /I "%LUA51%\include" /Felanes\core.dll src\*.c "%LUA_LIB%\lua5.1.lib" | 133 | cl %WARN% %FLAGS% /I "%LUA51%\include" /Felanes\core.dll src\*.cpp "%LUA_LIB%\lua5.1.lib" |
| 134 | @REM cl %WARN% %FLAGS% /I "%LUA51%\include" /Felanes\core.dll src\*.c "%LUA_LIB%\lua5.1.lib" /link /NODEFAULTLIB:libcmt | 134 | @REM cl %WARN% %FLAGS% /I "%LUA51%\include" /Felanes\core.dll src\*.cpp "%LUA_LIB%\lua5.1.lib" /link /NODEFAULTLIB:libcmt |
| 135 | 135 | ||
| 136 | @del lanes\core.lib | 136 | @del lanes\core.lib |
| 137 | @del lanes\core.exp | 137 | @del lanes\core.exp |
diff --git a/src/Makefile b/src/Makefile index c4d4c30..cef4174 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -119,7 +119,7 @@ MODULE_DIR=$(MODULE) | |||
| 119 | #--- | 119 | #--- |
| 120 | all: $(MODULE)/core.$(_SO) | 120 | all: $(MODULE)/core.$(_SO) |
| 121 | 121 | ||
| 122 | %.o: %.c *.h Makefile | 122 | %.o: %.cpp *.h Makefile |
| 123 | 123 | ||
| 124 | # Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think) | 124 | # Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think) |
| 125 | # | 125 | # |
diff --git a/src/cancel.c b/src/cancel.cpp index 0a5adb6..0a5adb6 100644 --- a/src/cancel.c +++ b/src/cancel.cpp | |||
diff --git a/src/compat.c b/src/compat.cpp index 19159a9..19159a9 100644 --- a/src/compat.c +++ b/src/compat.cpp | |||
diff --git a/src/deep.c b/src/deep.cpp index 58da457..58da457 100644 --- a/src/deep.c +++ b/src/deep.cpp | |||
diff --git a/src/keeper.c b/src/keeper.cpp index 8aa734a..8aa734a 100644 --- a/src/keeper.c +++ b/src/keeper.cpp | |||
diff --git a/src/lanes.c b/src/lanes.cpp index deee90c..deee90c 100644 --- a/src/lanes.c +++ b/src/lanes.cpp | |||
diff --git a/src/linda.c b/src/linda.cpp index eac6458..eac6458 100644 --- a/src/linda.c +++ b/src/linda.cpp | |||
diff --git a/src/state.c b/src/state.cpp index 85ad31e..85ad31e 100644 --- a/src/state.c +++ b/src/state.cpp | |||
diff --git a/src/threading.c b/src/threading.cpp index 2464d03..2464d03 100644 --- a/src/threading.c +++ b/src/threading.cpp | |||
diff --git a/src/tools.c b/src/tools.cpp index 6f4a06a..6f4a06a 100644 --- a/src/tools.c +++ b/src/tools.cpp | |||
diff --git a/src/universe.c b/src/universe.cpp index 0a014f7..0a014f7 100644 --- a/src/universe.c +++ b/src/universe.cpp | |||
